svn commit: r18632 - trunk/src/argouml-app/src/org/argouml/uml/ui/TabSrc.java

Author: linus
Date: 2010-08-08 01:21:55-0700
New Revision: 18632

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/TabSrc.java

Log:
Fixed two findbugs problems (and some style problems).

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/TabSrc.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/TabSrc.java?view=diff&pathrev=18632&r1=18631&r2=18632
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/TabSrc.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/TabSrc.java	2010-08-08 01:21:55-0700
@@ -80,7 +80,11 @@
     /**
      * These predicates determine if this tab is enabled.
      */
-    private static List<Predicate> predicates;
+    private static List<Predicate> predicates = new ArrayList<Predicate>();
+    static {
+        /* Add a predicate for ArgoUML's default capabilities: */
+        predicates.add(new DefaultPredicate());
+    }
 
 
     /**
@@ -89,12 +93,6 @@
      */
     public TabSrc() {
         super("tab.source", true);
-        if (predicates == null) {
-            predicates = new ArrayList<Predicate>();
-            /* Add a predicate for ArgoUML's
-             * default capabilities: */
-            predicates.add(new DefaultPredicate());
-        }
 
         setEditable(false);
         langName = (Language) cbLang.getSelectedItem();
@@ -142,8 +140,9 @@
         if (files == null) {
 	    generateSource(modelObject);
         }
-        if (files != null && files.length > cbFiles.getSelectedIndex())
+        if (files != null && files.length > cbFiles.getSelectedIndex()) {
             return files[cbFiles.getSelectedIndex()].getContent();
+        }
         return null;
     }
 
@@ -152,12 +151,15 @@
         LOG.debug("TabSrc   setting src for " 
                 + Model.getFacade().getName(getTarget()));
         Object modelObject = getTarget();
-        if (getTarget() instanceof FigNode)
+        if (getTarget() instanceof FigNode) {
             modelObject = ((FigNode) getTarget()).getOwner();
-        if (getTarget() instanceof FigEdge)
+        }
+        if (getTarget() instanceof FigEdge) {
             modelObject = ((FigEdge) getTarget()).getOwner();
-        if (modelObject == null)
+        }
+        if (modelObject == null) {
             return;
+        }
         /* TODO: Implement this! */
         //Parser.ParseAndUpdate(modelObject, s);
     }
@@ -234,7 +236,7 @@
         predicates.add(predicate);
     }
 
-    class DefaultPredicate implements Predicate {
+    private static class DefaultPredicate implements Predicate {
         public boolean evaluate(Object object) {
             return (Model.getFacade().isAClassifier(object));
         }

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

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