Author: tfmorris Date: 2008-05-02 09:18:03-0700 New Revision: 14594 Modified: trunk/src/argouml-app/src/org/argouml/persistence/AbstractFilePersister.java trunk/src/argouml-app/src/org/argouml/persistence/MemberFilePersister.java trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java trunk/src/argouml-app/src/org/argouml/persistence/OldModelMemberFilePersister.java trunk/src/argouml-app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java trunk/src/argouml-app/src/org/argouml/persistence/XmlFilePersister.java trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java
Log: Fix indentation, long lines, & Javadoc Modified: trunk/src/argouml-app/src/org/argouml/persistence/AbstractFilePersister.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/AbstractFilePersister.java?view=diff&rev=14594&p1=trunk/src/argouml-app/src/org/argouml/persistence/AbstractFilePersister.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/AbstractFilePersister.java&r1=14593&r2=14594 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/persistence/AbstractFilePersister.java (original) +++ trunk/src/argouml-app/src/org/argouml/persistence/AbstractFilePersister.java 2008-05-02 09:18:03-0700 @@ -60,13 +60,15 @@ /** * Map of persisters by target class */ - private static Map<Class, Class<? extends MemberFilePersister>> persistersByClass = + private static Map<Class, Class<? extends MemberFilePersister>> + persistersByClass = new HashMap<Class, Class<? extends MemberFilePersister>>(); /** * Map of persisters by tag / file extension */ - private static Map<String, Class<? extends MemberFilePersister>> persistersByTag = + private static Map<String, Class<? extends MemberFilePersister>> + persistersByTag = new HashMap<String, Class<? extends MemberFilePersister>>(); static { Modified: trunk/src/argouml-app/src/org/argouml/persistence/MemberFilePersister.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/MemberFilePersister.java?view=diff&rev=14594&p1=trunk/src/argouml-app/src/org/argouml/persistence/MemberFilePersister.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/MemberFilePersister.java&r1=14593&r2=14594 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/persistence/MemberFilePersister.java (original) +++ trunk/src/argouml-app/src/org/argouml/persistence/MemberFilePersister.java 2008-05-02 09:18:03-0700 @@ -112,7 +112,7 @@ * XML file (ie part of .uml) * @throws SaveException if the save fails * @deprecated for 0.25.4 by tfmorris. Use - * [EMAIL PROTECTED] #save(ProjectMember, OutputStream, boolean)}. + * [EMAIL PROTECTED] #save(ProjectMember, OutputStream)}. */ @Deprecated public abstract void save( Modified: trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java?view=diff&rev=14594&p1=trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java&r1=14593&r2=14594 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java (original) +++ trunk/src/argouml-app/src/org/argouml/persistence/ModelMemberFilePersister.java 2008-05-02 09:18:03-0700 @@ -119,7 +119,7 @@ readModels(source); mmodel = getCurModel(); } catch (OpenException e) { - LOG.error("UmlException caught", e); + LOG.error("UmlException caught", e); throw e; } // This should probably be inside xmiReader.parse @@ -150,12 +150,11 @@ /** * Save the project model to XMI. * - * @see org.argouml.persistence.MemberFilePersister#save( - * org.argouml.kernel.ProjectMember, java.io.Writer, - * java.lang.Integer) + * [EMAIL PROTECTED] */ @Deprecated @Override + @SuppressWarnings("deprecation") public void save(ProjectMember member, Writer w, boolean xmlFragment) throws SaveException { Modified: trunk/src/argouml-app/src/org/argouml/persistence/OldModelMemberFilePersister.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/OldModelMemberFilePersister.java?view=diff&rev=14594&p1=trunk/src/argouml-app/src/org/argouml/persistence/OldModelMemberFilePersister.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/OldModelMemberFilePersister.java&r1=14593&r2=14594 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/persistence/OldModelMemberFilePersister.java (original) +++ trunk/src/argouml-app/src/org/argouml/persistence/OldModelMemberFilePersister.java 2008-05-02 09:18:03-0700 @@ -43,12 +43,11 @@ /** * Save the project model to XMI. * - * @see org.argouml.persistence.MemberFilePersister#save( - * org.argouml.kernel.ProjectMember, java.io.Writer, - * boolean) + * [EMAIL PROTECTED] */ @Deprecated @Override + @SuppressWarnings("deprecation") public void save(ProjectMember member, Writer w, boolean xmlFragment) throws SaveException { Modified: trunk/src/argouml-app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java?view=diff&rev=14594&p1=trunk/src/argouml-app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java&r1=14593&r2=14594 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java (original) +++ trunk/src/argouml-app/src/org/argouml/persistence/ProfileConfigurationFilePersister.java 2008-05-02 09:18:03-0700 @@ -225,6 +225,9 @@ /* * @see org.argouml.persistence.MemberFilePersister#save(org.argouml.kernel.ProjectMember, java.io.Writer, boolean) */ + @Override + @Deprecated + @SuppressWarnings("deprecation") public void save(ProjectMember member, Writer writer, boolean xmlFragment) throws SaveException { PrintWriter w = new PrintWriter(writer); Modified: trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java?view=diff&rev=14594&p1=trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java&r1=14593&r2=14594 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java (original) +++ trunk/src/argouml-app/src/org/argouml/persistence/TodoListMemberFilePersister.java 2008-05-02 09:18:03-0700 @@ -97,8 +97,10 @@ @Deprecated + @SuppressWarnings("deprecation") + @Override public void save(ProjectMember member, Writer writer, boolean xmlFragment) - throws SaveException { + throws SaveException { LOG.info("Saving todo list"); @@ -157,8 +159,8 @@ PrintWriter pw = new PrintWriter(outStream); try { Designer.disableCritiquing(); - // WARNING: The GEF implementation of the OutputStream version of this - // method doesn't work - tfm - 20070531 + // WARNING: The GEF implementation of the OutputStream version of + // this method doesn't work - tfm - 20070531 expander.expand(pw, member); } catch (ExpansionException e) { throw new SaveException(e); Modified: trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java?view=diff&rev=14594&p1=trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java&r1=14593&r2=14594 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java (original) +++ trunk/src/argouml-app/src/org/argouml/persistence/UmlFilePersister.java 2008-05-02 09:18:03-0700 @@ -63,7 +63,6 @@ import org.argouml.application.api.Argo; import org.argouml.application.helpers.ApplicationVersion; import org.argouml.i18n.Translator; -import org.argouml.kernel.ProfileConfiguration; import org.argouml.kernel.Project; import org.argouml.kernel.ProjectFactory; import org.argouml.kernel.ProjectMember; @@ -214,6 +213,7 @@ * * [EMAIL PROTECTED] */ + @Override public boolean isSaveEnabled() { return true; } Modified: trunk/src/argouml-app/src/org/argouml/persistence/XmlFilePersister.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/XmlFilePersister.java?view=diff&rev=14594&p1=trunk/src/argouml-app/src/org/argouml/persistence/XmlFilePersister.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/XmlFilePersister.java&r1=14593&r2=14594 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/persistence/XmlFilePersister.java (original) +++ trunk/src/argouml-app/src/org/argouml/persistence/XmlFilePersister.java 2008-05-02 09:18:03-0700 @@ -35,6 +35,7 @@ /* * @see org.argouml.persistence.AbstractFilePersister#getExtension() */ + @Override public String getExtension() { return "xml"; } @@ -44,6 +45,7 @@ * * @see org.argouml.persistence.AbstractFilePersister#hasAnIcon() */ + @Override public boolean hasAnIcon() { return false; } Modified: trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java?view=diff&rev=14594&p1=trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java&p2=trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java&r1=14593&r2=14594 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java (original) +++ trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java 2008-05-02 09:18:03-0700 @@ -362,21 +362,21 @@ final List<Image> argoImages = new ArrayList<Image>(2); argoImages.add(argoImage16x16.getImage()); argoImages.add(argoImage32x32.getImage()); - try { + try { // java.awt.Window.setIconImages is new in Java 6. - // check for it using reflection on current instance + // check for it using reflection on current instance final Method m = getClass().getMethod("setIconImages", List.class); - m.invoke(this, argoImages); - } catch (InvocationTargetException e) { + m.invoke(this, argoImages); + } catch (InvocationTargetException e) { LOG.error("Exception", e); } catch (NoSuchMethodException e) { LOG.error("Exception", e); - } catch (IllegalArgumentException e) { + } catch (IllegalArgumentException e) { LOG.error("Exception", e); - } catch (IllegalAccessException e) { + } catch (IllegalAccessException e) { LOG.error("Exception", e); - } + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
