svn commit: r15829 - trunk/src/argouml-app: src/org/argouml/application src/org/argouml/language/java/cognitive tests/org/argouml/application/api

Author: thn
Date: 2008-09-29 14:57:44-0700
New Revision: 15829

Removed:
   trunk/src/argouml-app/src/org/argouml/language/java/cognitive/
Modified:
   trunk/src/argouml-app/src/org/argouml/application/Main.java
   trunk/src/argouml-app/src/org/argouml/application/StartCritics.java
   trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java

Log:
remove Java critics support (now in Java module)

Modified: trunk/src/argouml-app/src/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/Main.java?view=diff&rev=15829&p1=trunk/src/argouml-app/src/org/argouml/application/Main.java&p2=trunk/src/argouml-app/src/org/argouml/application/Main.java&r1=15828&r2=15829
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/application/Main.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/application/Main.java	2008-09-29 14:57:44-0700
@@ -61,7 +61,6 @@
 import org.argouml.configuration.Configuration;
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.ProjectManager;
-import org.argouml.language.java.generator.GeneratorJava;
 import org.argouml.model.Model;
 import org.argouml.moduleloader.InitModuleLoader;
 import org.argouml.moduleloader.ModuleLoader2;
@@ -85,7 +84,6 @@
 import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
 import org.argouml.uml.diagram.ui.InitDiagramAppearanceUI;
 import org.argouml.uml.diagram.use_case.ui.InitUseCaseDiagram;
-import org.argouml.uml.reveng.java.JavaImport;
 import org.argouml.uml.ui.InitUmlUI;
 import org.argouml.util.ArgoFrame;
 import org.argouml.util.JavaRuntimeUtility;
@@ -392,9 +390,6 @@
         st.mark("initialize the profile subsystem");
         new InitProfileSubsystem().init();
 
-        // Initialize the Java code generator. (why so early? - tfm)
-        GeneratorJava.getInstance();
-
         // The reason the gui is initialized before the commands are run
         // is that some of the commands will use the projectbrowser.
         st.mark("initialize gui");
@@ -976,8 +971,6 @@
      * @see java.lang.Runnable#run()
      */
     public void run() {
-        // Why is this done separately? - tfm?
-	new JavaImport().enable();
 	huntForInternalModules();
         LOG.info("Module loading done");
     }

Modified: trunk/src/argouml-app/src/org/argouml/application/StartCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/StartCritics.java?view=diff&rev=15829&p1=trunk/src/argouml-app/src/org/argouml/application/StartCritics.java&p2=trunk/src/argouml-app/src/org/argouml/application/StartCritics.java&r1=15828&r2=15829
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/application/StartCritics.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/application/StartCritics.java	2008-09-29 14:57:44-0700
@@ -31,7 +31,6 @@
 import org.argouml.configuration.Configuration;
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
-import org.argouml.language.java.cognitive.critics.InitJavaCritics;
 import org.argouml.model.Model;
 import org.argouml.pattern.cognitive.critics.InitPatternCritics;
 import org.argouml.uml.cognitive.UMLDecision;
@@ -53,7 +52,6 @@
     public void run() {
         Designer dsgr = Designer.theDesigner();
         SubsystemUtility.initSubsystem(new InitCognitiveCritics());
-        SubsystemUtility.initSubsystem(new InitJavaCritics());
         SubsystemUtility.initSubsystem(new InitPatternCritics());
         org.argouml.uml.cognitive.checklist.Init.init();
         // set the icon for this poster

Modified: trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java?view=diff&rev=15829&p1=trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java&p2=trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java&r1=15828&r2=15829
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java	2008-09-29 14:57:44-0700
@@ -31,7 +31,6 @@
 
 import org.argouml.cognitive.checklist.ui.InitCheckListUI;
 import org.argouml.cognitive.ui.InitCognitiveUI;
-import org.argouml.language.java.cognitive.critics.InitJavaCritics;
 import org.argouml.model.InitializeModel;
 import org.argouml.moduleloader.InitModuleLoader;
 import org.argouml.notation.InitNotation;
@@ -78,7 +77,6 @@
         initialisers.add(new InitCollaborationDiagram());
         initialisers.add(new InitDeploymentDiagram());
         initialisers.add(new InitDiagramAppearanceUI());
-        initialisers.add(new InitJavaCritics());
         initialisers.add(new InitModuleLoader());
         initialisers.add(new InitNotation());
         initialisers.add(new InitNotationJava());