svn commit: r16529 - trunk/src/argouml-app/src/org/argouml/uml/ui

Author: thn
Date: 2009-01-06 06:49:04-0800
New Revision: 16529

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateOne.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java

Log:
fix for issue 5587: Code Generation menu disabled
(It's safe to always enable these menu items. But it seems weird to me that the isEnabled method is called only at startup, do we have a problem?

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java?view=diff&pathrev=16529&r1=16528&r2=16529
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateAll.java	2009-01-06 06:49:04-0800
@@ -129,9 +129,10 @@
      */
     @Override
     public boolean isEnabled() {
-	ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
-	return super.isEnabled()
-	    && (activeDiagram instanceof UMLClassDiagram);
+        // TODO: this seems to be called at startup only so no check so far
+        return true;
+	//ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
+	//return (activeDiagram instanceof UMLClassDiagram);
     }
 
     /**

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateOne.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateOne.java?view=diff&pathrev=16529&r1=16528&r2=16529
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateOne.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateOne.java	2009-01-06 06:49:04-0800
@@ -77,11 +77,10 @@
      */
     @Override
     public boolean isEnabled() {
-        if (!super.isEnabled()) {
-            return false;
-	}
-        List classes = getCandidates();
-        return classes.size() > 0;
+        // TODO: this seems to be called at startup only so no check so far
+        return true;
+        //List classes = getCandidates();
+        //return classes.size() > 0;
     }
 
     /**

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java?view=diff&pathrev=16529&r1=16528&r2=16529
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerateProjectCode.java	2009-01-06 06:49:04-0800
@@ -102,8 +102,7 @@
      * @see org.tigris.gef.undo.UndoableAction#isEnabled()
      */
     public boolean isEnabled() {
-        ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
-        return super.isEnabled() && (activeDiagram != null);
+        return true;
     }
 
     /**

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java?view=diff&pathrev=16529&r1=16528&r2=16529
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionGenerationSettings.java	2009-01-06 06:49:04-0800
@@ -66,9 +66,7 @@
      */
     @Override
     public boolean isEnabled() {
-	ArgoDiagram activeDiagram = DiagramUtils.getActiveDiagram();
-	return super.isEnabled()
-	    && (activeDiagram != null);
+	return true;
     }
 
 }

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1007670

To unsubscribe from this discussion, e-mail: [[email protected]].