Merge branch 'desarrollo'

.classpath

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

META-INF/MANIFEST.MF

@@ -18,8 +18,8 @@ Require-Bundle: javax.inject,
  org.eclipse.jface.text;bundle-version="3.12.0",
  org.eclipse.core.resources;bundle-version="3.12.0",
  org.eclipse.ui;bundle-version="3.109.0",
- org.eclipse.jdt.debug;bundle-version="3.11.0",
- org.eclipse.debug.core;bundle-version="3.11.0"
+ org.eclipse.debug.core;bundle-version="3.11.0",
+ org.eclipse.jdt.debug;bundle-version="3.11.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.annotation;version="1.2.0"
 Bundle-ActivationPolicy: lazy

fragment.e4xmi

@@ -1,25 +1,28 @@
-<?xml version="1.0" encoding="ASCII"?>
-<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/descriptor/basic" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_BxaXACerEeWxCPrV0pAZQQ">
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_EI7oACerEeWxCPrV0pAZQQ" featurename="descriptors" parentElementId="xpath:/">
-    <elements xsi:type="basic:PartDescriptor" xmi:id="_KMklcCerEeWxCPrV0pAZQQ" elementId="org.tec.datos1.flow.mainview" label="FlowChart" iconURI="platform:/plugin/org.tec.datos1.flow/icons/002-flow-1.png" tooltip="" category="Flow" contributionURI="bundleclass://org.tec.datos1.flow/org.tec.datos1.flow.parts.DiagramView">
-      <tags>View</tags>
-      <tags>categoryTag:Sample Category</tags>
-    </elements>
-  </fragments>
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_g64RQK_UEeeYCvxE0peUaw" featurename="handlers" parentElementId="xpath:/">
-    <elements xsi:type="commands:Handler" xmi:id="_xotggK_UEeeYCvxE0peUaw" elementId="org.tec.datos1.flow.handler.stepin" contributionURI="bundleclass://org.tec.datos1.flow/org.tec.datos1.flow.handlers.StepInHandler" command="_K1w-0K_VEeeYCvxE0peUaw"/>
-    <elements xsi:type="commands:Handler" xmi:id="_4e_b0K_UEeeYCvxE0peUaw" elementId="org.tec.datos1.flow.handler.stepover" contributionURI="bundleclass://org.tec.datos1.flow/org.tec.datos1.flow.handlers.StepOverHandler" command="_bALX8K_VEeeYCvxE0peUaw"/>
-  </fragments>
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_HmRkAK_VEeeYCvxE0peUaw" featurename="commands" parentElementId="xpath:/">
-    <elements xsi:type="commands:Command" xmi:id="_K1w-0K_VEeeYCvxE0peUaw" elementId="org.tec.datos1.flow.command.stepin" commandName="Step In"/>
-    <elements xsi:type="commands:Command" xmi:id="_bALX8K_VEeeYCvxE0peUaw" elementId="org.tec.datos1.flow.command.stepover" commandName="Step Over"/>
-  </fragments>
-  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_c2QHoLFoEeefrPZk3-rHaA" featurename="trimContributions" parentElementId="xpath:/">
-    <elements xsi:type="menu:TrimContribution" xmi:id="_iTHY8LFoEeefrPZk3-rHaA" elementId="org.tec.datos1.flow.trimcontribution.0" parentId="org.eclipse.ui.main.toolbar" positionInParent="">
-      <children xsi:type="menu:ToolBar" xmi:id="_9BC0ILFoEeefrPZk3-rHaA" elementId="org.tec.datos1.flow.toolbar">
-        <children xsi:type="menu:HandledToolItem" xmi:id="__af-0LFoEeefrPZk3-rHaA" elementId="org.tec.datos1.flow.handledtoolitem.stepin" label="Step In" iconURI="platform:/plugin/org.tec.datos1.flow/icons/008-login-square-arrow-button-outline.png" command="_K1w-0K_VEeeYCvxE0peUaw"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_Ff_WYLFpEeefrPZk3-rHaA" elementId="org.tec.datos1.flow.handledtoolitem.stepover" label="Step Over" iconURI="platform:/plugin/org.tec.datos1.flow/icons/006-arrow-into-drive-symbol.png" command="_bALX8K_VEeeYCvxE0peUaw"/>
-      </children>
-    </elements>
-  </fragments>
-</fragment:ModelFragments>
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/descriptor/basic" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_BxaXACerEeWxCPrV0pAZQQ">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_EI7oACerEeWxCPrV0pAZQQ" featurename="descriptors" parentElementId="xpath:/">
+    <elements xsi:type="basic:PartDescriptor" xmi:id="_KMklcCerEeWxCPrV0pAZQQ" elementId="org.tec.datos1.flow.mainview" label="FlowChart" iconURI="platform:/plugin/org.tec.datos1.flow/icons/003-flow-1.png" tooltip="" category="Flow" contributionURI="bundleclass://org.tec.datos1.flow/org.tec.datos1.flow.parts.DiagramView">
+      <tags>View</tags>
+      <tags>categoryTag:Sample Category</tags>
+    </elements>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_g64RQK_UEeeYCvxE0peUaw" featurename="handlers" parentElementId="xpath:/">
+    <elements xsi:type="commands:Handler" xmi:id="_4e_b0K_UEeeYCvxE0peUaw" elementId="org.tec.datos1.flow.handler.stepover" contributionURI="bundleclass://org.tec.datos1.flow/org.tec.datos1.flow.handlers.StepOverHandler" command="_bALX8K_VEeeYCvxE0peUaw"/>
+    <elements xsi:type="commands:Handler" xmi:id="_xotggK_UEeeYCvxE0peUaw" elementId="org.tec.datos1.flow.handler.stepin" contributionURI="bundleclass://org.tec.datos1.flow/org.tec.datos1.flow.handlers.StepInHandler" command="_K1w-0K_VEeeYCvxE0peUaw"/>
+    <elements xsi:type="commands:Handler" xmi:id="_p6u8ILrgEeeTZLRilA2UMQ" elementId="org.tec.datos1.flow.handler.load" contributionURI="bundleclass://org.tec.datos1.flow/org.tec.datos1.flow.handlers.Load" command="_vqwaALrgEeeTZLRilA2UMQ"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_HmRkAK_VEeeYCvxE0peUaw" featurename="commands" parentElementId="xpath:/">
+    <elements xsi:type="commands:Command" xmi:id="_K1w-0K_VEeeYCvxE0peUaw" elementId="org.tec.datos1.flow.command.stepin" commandName="Step In"/>
+    <elements xsi:type="commands:Command" xmi:id="_bALX8K_VEeeYCvxE0peUaw" elementId="org.tec.datos1.flow.command.stepover" commandName="Step Over"/>
+    <elements xsi:type="commands:Command" xmi:id="_vqwaALrgEeeTZLRilA2UMQ" elementId="org.tec.datos1.flow.command.load" commandName="Load"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_c2QHoLFoEeefrPZk3-rHaA" featurename="trimContributions" parentElementId="xpath:/">
+    <elements xsi:type="menu:TrimContribution" xmi:id="_iTHY8LFoEeefrPZk3-rHaA" elementId="org.tec.datos1.flow.trimcontribution.0" parentId="org.eclipse.ui.main.toolbar" positionInParent="after=additions">
+      <children xsi:type="menu:ToolBar" xmi:id="_9BC0ILFoEeefrPZk3-rHaA" elementId="org.tec.datos1.flow.toolbar">
+        <children xsi:type="menu:HandledToolItem" xmi:id="__af-0LFoEeefrPZk3-rHaA" elementId="org.tec.datos1.flow.handledtoolitem.stepin" label="Step In" iconURI="platform:/plugin/org.tec.datos1.flow/icons/icons8-step_into.png" command="_K1w-0K_VEeeYCvxE0peUaw"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_Ff_WYLFpEeefrPZk3-rHaA" elementId="org.tec.datos1.flow.handledtoolitem.stepover" label="Step Over" iconURI="platform:/plugin/org.tec.datos1.flow/icons/icons8-step_over.png" command="_bALX8K_VEeeYCvxE0peUaw"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_zJsmELrgEeeTZLRilA2UMQ" elementId="org.tec.datos1.flow.handledtoolitem.load" label="Load" iconURI="platform:/plugin/org.tec.datos1.flow/icons/005-browser.png" command="_vqwaALrgEeeTZLRilA2UMQ"/>
+      </children>
+    </elements>
+  </fragments>
+</fragment:ModelFragments>

org.tec.datos1.flow.iml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Osmorc" name="OSGi">
+      <configuration manifestGenerationMode="Manually" manifestLocation="META-INF/MANIFEST.MF" jarfileLocation="org.tec.datos1.flow.jar" outputPathType="CompilerOutputPath" bndFileLocation="" bundlorFileLocation="" bundleActivator="" bundleSymbolicName="" bundleVersion="1.0.0" ignoreFilePattern="" useProjectDefaultManifestFileLocation="false" alwaysRebuildBundleJAR="false" doNotSynchronizeWithMaven="false">
+        <additionalProperties />
+        <additionalJARContents />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/bin" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="JavaSE-1.8" jdkType="JavaSDK" />
+    <orderEntry type="library" name="ECLIPSE" level="application" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

plugin.xml

@@ -11,62 +11,6 @@
       </fragment>
    </extension>
 
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            name="RunFlowChart"
-            id="org.tec.datos1.flow.commands.Run">
-      </category>
-      <command
-            name="Run Flow Chart"
-            categoryId="org.tec.datos1.flow.commands.Run"
-            id="org.tec.datos1.flow.commands.RunCommand">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            commandId="org.tec.datos1.flow.commands.RunCommand"
-            class="org.tec.datos1.flow.handlers.Handler">
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.ui.bindings">
-      <key
-            commandId="org.tec.datos1.flow.commands.RunCommand"
-            contextId="org.eclipse.ui.contexts.window"
-            sequence="M1+6"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu?after=additions">
-         <menu
-               label="FlowChart"
-               mnemonic="M"
-               id="org.tec.datos1.flow.menus.FlowChart">
-            <command
-                  commandId="org.tec.datos1.flow.commands.RunCommand"
-                  mnemonic="S"
-                  id="org.tec.datos1.flow.menus.RunCommand">
-            </command>
-         </menu>
-      </menuContribution>
-      <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-         <toolbar
-               id="org.tec.datos1.flow.toolbars.sampleToolbar">
-            <command
-                  commandId="org.tec.datos1.flow.commands.RunCommand"
-                  icon="icons/001-diagrams.png"
-                  tooltip="Flow Chart"
-                  id="org.tec.datos1.flow.toolbar.RunCommand">
-            </command>
-         </toolbar>
-      </menuContribution>
-   </extension>
    <extension
        	point="org.eclipse.jdt.debug.breakpointListeners">
    		<breakpointActionDelegate

src/org/tec/datos1/flow/Activator.java

@@ -1,7 +1,9 @@
 package org.tec.datos1.flow;
 
+import org.eclipse.jdt.debug.core.JDIDebugModel;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
+import org.tec.datos1.flow.debug.DebugListener;
 
 public class Activator implements BundleActivator {
 
@@ -16,7 +18,10 @@ static BundleContext getContext() {
 	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
 	 */
 	public void start(BundleContext bundleContext) throws Exception {
+		JDIDebugModel.addJavaBreakpointListener(new DebugListener());
 		Activator.context = bundleContext;
+
+
 	}
 
 	/*

src/org/tec/datos1/flow/handlers/Handler.java → src/org/tec/datos1/flow/CodeParser.java

@@ -1,76 +1,96 @@
-package org.tec.datos1.flow.handlers;
-
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.debug.core.IJavaThread;
-import org.eclipse.jdt.debug.core.JDIDebugModel;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.tec.datos1.flow.debug.DebugListener;
-import org.tec.datos1.flow.storage.ASTStorage;
-
-public class Handler extends AbstractHandler {
-
-    @Override
-
-    public Object execute(ExecutionEvent event) throws ExecutionException {
-
-    	IWorkbenchPart workbenchPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-    	ICompilationUnit IcUnit = null;
-    	try{
-    		IFile file = (IFile) workbenchPart.getSite().getPage().getActiveEditor().getEditorInput().getAdapter(IFile.class);
-    		IcUnit = (ICompilationUnit) JavaCore.create(file);
-    	}catch(Exception e) {
-    		System.err.println("Debe tener una clase abierta");
-    		return null;
-    	}
-    	try {
-    		createAST(IcUnit);
-
-    		//poner en un "main"
-    		JDIDebugModel.addJavaBreakpointListener(new DebugListener());
-
-    	}catch(JavaModelException exeption){}
-
-		return null;
-    }
-
-    private void createAST(ICompilationUnit IcUnit)
-            throws JavaModelException {
-
-            CompilationUnit parse = parse(IcUnit);
-            ASTStorage.setCompUnit(parse);
-            MethodVisitor visitor = new MethodVisitor();
-            parse.accept(visitor);
-
-    }
-
-    /**
-     * Reads a ICompilationUnit and creates the AST DOM for manipulating the
-     * Java source file
-     *
-     * @param unit
-     * @return
-     */
-
-    public static CompilationUnit parse(ICompilationUnit unit) {
-        ASTParser parser = ASTParser.newParser(AST.JLS3);
-        parser.setKind(ASTParser.K_COMPILATION_UNIT);
-        parser.setSource(unit);
-        parser.setResolveBindings(true);
-
-        return (CompilationUnit) parser.createAST(null); // parse
-    }
-
-
-
-}
+package org.tec.datos1.flow;
+
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
+import org.tec.datos1.flow.handlers.MethodVisitor;
+import org.tec.datos1.flow.storage.ASTStorage;
+
+
+public class CodeParser {
+
+	/**
+	 * Este método se encarga de parsear el código de la 
+	 * clase abierta en el instante que se llama el método
+	 * @throws ExecutionException
+	 */
+    public static void execute() throws ExecutionException {
+    	if (ASTStorage.getRoot() != null){
+    		ASTStorage.getRoot().deleteChildren();
+    	}
+    	IWorkbenchPart workbenchPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
+    	ICompilationUnit IcUnit = null;
+
+    	try{
+    		IFile file = (IFile) workbenchPart.getSite().getPage().getActiveEditor().getEditorInput().getAdapter(IFile.class);
+    		IcUnit = (ICompilationUnit) JavaCore.create(file);
+    	}catch(Exception e) {
+    		System.err.println("Debe tener una clase abierta");
+    	}	
+    	try {
+
+    		createAST(IcUnit);
+
+    	}catch(JavaModelException exeption){}
+
+    }
+
+    /**
+	 * Este método se encarga de parsear el código de la 
+	 * clase abierta en el instante que se llama el método
+	 * @throws ExecutionException
+	 */
+    public static void executeSpecific(ICompilationUnit unit ) throws ExecutionException {
+    	if (ASTStorage.getRoot() != null){
+    		ASTStorage.getRoot().deleteChildren();
+    	}
+    	try {
+			createAST(unit);
+		} catch (JavaModelException e) {
+			e.printStackTrace();
+		}
+    }
+
+    /**
+     * Crea el arbol AST
+     * @param IcUnit Clase que se va a analizar
+     * @throws JavaModelException
+     */
+    private static void createAST(ICompilationUnit IcUnit) throws JavaModelException {
+
+            CompilationUnit parse = parse(IcUnit);
+            ASTStorage.setCompUnit(parse);
+            MethodVisitor visitor = new MethodVisitor();
+            parse.accept(visitor);
+
+    }
+
+
+    /**
+     * Reads a ICompilationUnit and creates the AST DOM for manipulating the
+     * Java source file
+     *
+     * @param unit
+     * @return
+     */
+
+    public static CompilationUnit parse(ICompilationUnit unit) {
+        ASTParser parser = ASTParser.newParser(AST.JLS3);
+        parser.setKind(ASTParser.K_COMPILATION_UNIT);
+        parser.setSource(unit);
+        parser.setResolveBindings(true);
+
+        return (CompilationUnit) parser.createAST(null); // parse
+    }
+
+
+
+}