svn commit: r14247 - trunk/src/app/src/org/argouml: language/java/generator persistence ui ui/cmd

Author: tfmorris
Date: 2008-03-27 23:35:16-0700
New Revision: 14247

Modified:
   trunk/src/app/src/org/argouml/language/java/generator/AttributeCodePiece.java
   trunk/src/app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java
   trunk/src/app/src/org/argouml/ui/HeapMonitor.java
   trunk/src/app/src/org/argouml/ui/cmd/ShortcutField.java

Log:
Fix code quality warnings flagged by compiler

Modified: trunk/src/app/src/org/argouml/language/java/generator/AttributeCodePiece.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/language/java/generator/AttributeCodePiece.java?view=diff&rev=14247&p1=trunk/src/app/src/org/argouml/language/java/generator/AttributeCodePiece.java&p2=trunk/src/app/src/org/argouml/language/java/generator/AttributeCodePiece.java&r1=14246&r2=14247
==============================================================================
--- trunk/src/app/src/org/argouml/language/java/generator/AttributeCodePiece.java	(original)
+++ trunk/src/app/src/org/argouml/language/java/generator/AttributeCodePiece.java	2008-03-27 23:35:16-0700
@@ -73,8 +73,8 @@
                 cpText = cpText.substring(0, cpText.indexOf('\n')).trim();
             }
 	    attributeDef.add(cp);
-	    int pos = 0;
-	    if ((pos = cpText.indexOf('[')) != -1) {
+	    int pos = cpText.indexOf('[');
+	    if (pos != -1) {
 		attributeNames.add(cpText.substring(0, pos));
 	    } else {
 		attributeNames.add(cpText);

Modified: trunk/src/app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java?view=diff&rev=14247&p1=trunk/src/app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java&p2=trunk/src/app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java&r1=14246&r2=14247
==============================================================================
--- trunk/src/app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java	(original)
+++ trunk/src/app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java	2008-03-27 23:35:16-0700
@@ -25,7 +25,6 @@
 package org.argouml.persistence;

 

 import java.io.BufferedReader;

-import java.io.ByteArrayInputStream;

 import java.io.IOException;

 import java.io.InputStream;

 import java.io.InputStreamReader;

@@ -39,15 +38,12 @@
 import java.util.Collection;

 import java.util.Iterator;

 

-import org.xml.sax.InputSource;

-

 import org.argouml.application.helpers.ApplicationVersion;

 import org.argouml.kernel.ProfileConfiguration;

 import org.argouml.kernel.Project;

 import org.argouml.kernel.ProjectMember;

 import org.argouml.model.Model;

 import org.argouml.model.UmlException;

-import org.argouml.model.XmiReader;

 import org.argouml.model.XmiWriter;

 import org.argouml.profile.Profile;

 import org.argouml.profile.ProfileFacade;

@@ -214,24 +210,19 @@
 	}

     }

 

-    private void printModelXMI(PrintWriter w, Object model) throws UmlException {

+    private void printModelXMI(PrintWriter w, Object model) 

+        throws UmlException {

+        

         StringWriter myWriter = new StringWriter();

-        XmiWriter xmiWriter = Model.getXmiWriter(model, myWriter, ApplicationVersion

-                .getVersion()

-                + "(" + UmlFilePersister.PERSISTENCE_VERSION + ")");

+        XmiWriter xmiWriter = Model.getXmiWriter(model, myWriter,

+                ApplicationVersion.getVersion() + "("

+                        + UmlFilePersister.PERSISTENCE_VERSION + ")");

         xmiWriter.write();

-        

+

         myWriter.flush();

         w.println("" + myWriter.toString());

     }

 

-    private Collection readModelXMI(String xmi) throws UmlException {

-        XmiReader xmiReader = Model.getXmiReader();

-        InputSource inputSource = 

-            new InputSource(new ByteArrayInputStream(xmi.getBytes()));

-        Collection elements = xmiReader.parse(inputSource, true);

-        return elements;

-    }

 

     @Override

     public void load(Project project, URL url) throws OpenException {


Modified: trunk/src/app/src/org/argouml/ui/HeapMonitor.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/ui/HeapMonitor.java?view=diff&rev=14247&p1=trunk/src/app/src/org/argouml/ui/HeapMonitor.java&p2=trunk/src/app/src/org/argouml/ui/HeapMonitor.java&r1=14246&r2=14247
==============================================================================
--- trunk/src/app/src/org/argouml/ui/HeapMonitor.java	(original)
+++ trunk/src/app/src/org/argouml/ui/HeapMonitor.java	2008-03-27 23:35:16-0700
@@ -130,9 +130,5 @@
                 });
         setToolTipText(tip);
     }
-
-    private void gc() {
-        Runtime.getRuntime().gc();
-    }
     
 }

Modified: trunk/src/app/src/org/argouml/ui/cmd/ShortcutField.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/ui/cmd/ShortcutField.java?view=diff&rev=14247&p1=trunk/src/app/src/org/argouml/ui/cmd/ShortcutField.java&p2=trunk/src/app/src/org/argouml/ui/cmd/ShortcutField.java&r1=14246&r2=14247
==============================================================================
--- trunk/src/app/src/org/argouml/ui/cmd/ShortcutField.java	(original)
+++ trunk/src/app/src/org/argouml/ui/cmd/ShortcutField.java	2008-03-27 23:35:16-0700
@@ -93,7 +93,8 @@
             } 
             
             private String toString(KeyEvent ke) { 
-                int keyCode = currentKeyCode = ke.getKeyCode(); 
+                currentKeyCode = ke.getKeyCode(); 
+                int keyCode = currentKeyCode; 
                 String modifText = 
                     KeyEventUtils.getModifiersText(ke.getModifiers());