svn commit: r12957 - trunk/src_new/org/argouml: application uml/cognitive/critics

Author: mvw
Date: 2007-07-01 13:04:21-0700
New Revision: 12957

Added:
   trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
      - copied, changed from r12955, /trunk/src_new/org/argouml/uml/cognitive/critics/Init.java
Removed:
   trunk/src_new/org/argouml/uml/cognitive/critics/Init.java
Modified:
   trunk/src_new/org/argouml/application/StartCritics.java

Log:
Made conform to the other critics subsystems initialisations.

Modified: trunk/src_new/org/argouml/application/StartCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/StartCritics.java?view=diff&rev=12957&p1=trunk/src_new/org/argouml/application/StartCritics.java&p2=trunk/src_new/org/argouml/application/StartCritics.java&r1=12956&r2=12957
==============================================================================
--- trunk/src_new/org/argouml/application/StartCritics.java	(original)
+++ trunk/src_new/org/argouml/application/StartCritics.java	2007-07-01 13:04:21-0700
@@ -36,6 +36,7 @@
 import org.argouml.pattern.cognitive.critics.InitPatternCritics;
 import org.argouml.uml.cognitive.UMLDecision;
 import org.argouml.uml.cognitive.critics.ChildGenUML;
+import org.argouml.uml.cognitive.critics.InitCognitiveCritics;
 
 /**
  * StartCritics is a thread which helps to start the critiquing thread.
@@ -51,7 +52,7 @@
      */
     public void run() {
         Designer dsgr = Designer.theDesigner();
-        org.argouml.uml.cognitive.critics.Init.init();
+        Main.initSubsystem(new InitCognitiveCritics());
         Main.initSubsystem(new InitJavaCritics());
         Main.initSubsystem(new InitPatternCritics());
         org.argouml.uml.cognitive.checklist.Init.init();

Removed: trunk/src_new/org/argouml/uml/cognitive/critics/Init.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/Init.java?view=auto&rev=12956

Copied: trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java (from r12955, /trunk/src_new/org/argouml/uml/cognitive/critics/Init.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java?view=diff&rev=12957&p1=/trunk/src_new/org/argouml/uml/cognitive/critics/Init.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&r1=12955&r2=12957
==============================================================================
--- /trunk/src_new/org/argouml/uml/cognitive/critics/Init.java	(original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java	2007-07-01 13:04:21-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -24,6 +24,11 @@
 
 package org.argouml.uml.cognitive.critics;
 
+import java.util.Collections;
+import java.util.List;
+
+import org.argouml.application.api.GUISettingsTabInterface;
+import org.argouml.application.api.InitSubsystem;
 import org.argouml.cognitive.Agency;
 import org.argouml.cognitive.CompoundCritic;
 import org.argouml.cognitive.Critic;
@@ -41,7 +46,7 @@
  * @author jrobbins
  * @see org.argouml.cognitive.Agency
  */
-public class Init {
+public class InitCognitiveCritics implements InitSubsystem {
 
     // UML specific
     private static Critic crAssocNameConflict = new CrAssocNameConflict();
@@ -107,8 +112,8 @@
 
     private static Critic crDisambigStateName = new CrDisambigStateName();
 
-    private static Critic crConflictingComposites =
-	new CrConflictingComposites();
+//    private static Critic crConflictingComposites =
+//	new CrConflictingComposites();
 
     private static Critic crTooManyAssoc = new CrTooManyAssoc();
 
@@ -263,7 +268,7 @@
     /**
      * static initializer, register all appropriate critics.
      */
-    public static void init() {
+    public void init() {
         Object modelCls = Model.getMetaTypes().getModel();
         Object packageCls = Model.getMetaTypes().getPackage();
         Object classCls = Model.getMetaTypes().getUMLClass();
@@ -414,4 +419,12 @@
 	Agency.register(new CrOppEndVsAttr(), classifierCls);
     }
 
+    public List<GUISettingsTabInterface> getProjectSettingsTabs() {
+        return Collections.emptyList();
+    }
+
+    public List<GUISettingsTabInterface> getSettingsTabs() {
+        return Collections.emptyList();
+    }
+
 }