Login | Register
My pages Projects Community openCollabNet

Discussions > Commits > svn commit: r151 - trunk/src/argouml-app/src/org/argouml/moduleloader/ModuleLoader2.java

argouml-spl
Discussion topic

Hide all messages in topic

All messages in topic

svn commit: r151 - trunk/src/argouml-app/src/org/argouml/moduleloader/ModuleLoader2.java

Author benjamin_klatt
Full name Benjamin Klatt
Date 2014-06-16 02:40:44 PDT
Message Author: benjamin_klatt
Date: 2014-06-16 02:40:44-0700
New Revision: 151

Modified:
   trunk/src/argouml-ap​p/src/org/argouml/mo​duleloader/ModuleLoa​der2.java

Log:
aligned indentation of feature specific code and markers

Modified: trunk/src/argouml-ap​p/src/org/argouml/mo​duleloader/ModuleLoa​der2.java
Url: http://argouml-spl.t​igris.org/source/bro​wse/argouml-spl/trun​k/src/argouml-app/sr​c/org/argouml/module​loader/ModuleLoader2​.java?view=diff&​pathrev=151&r1=1​50&r2=151
====================​====================​====================​==================
--- trunk/src/argouml-ap​p/src/org/argouml/mo​duleloader/ModuleLoa​der2.java (original)
+++ trunk/src/argouml-ap​p/src/org/argouml/mo​duleloader/ModuleLoa​der2.java 2014-06-16 02:40:44-0700
@@ -81,10 +81,10 @@
      * The keys is the list of available modules.
      */
     private Map<ModuleInterface, ModuleStatus> moduleStatus;
-
+
     /**
      * List of locations that we've searched and/or loaded modules
- * from. This is for information purposes only to allow it to
+ * from. This is for information purposes only to allow it to
      * be displayed in the settings Environment tab.
      */
     private List<String> extensionLocations = new ArrayList<String>();
@@ -342,7 +342,7 @@
                 //#endif
             }
         } else if (status.isEnabled() && !status.isSelected()) {
- try {
+ try {
                 if (module.disable()) {
                     someModuleSucceeded = true;
                     status.setDisabled();
@@ -447,7 +447,7 @@
      */
     private void huntForModules() {
         //#if defined(SEQUENCEDIAGRAM)
- //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:MethodBody
+ //@#$LPS-SEQUENCEDI​AGRAM:GranularityTyp​e:MethodBody
         huntForModulesFromEx​tensionDir();
         // TODO: huntForModulesFromJa​vaWebStart();
 
@@ -473,14 +473,14 @@
         }
      //#endif
     }
-
+
     /**
      * Find and enable modules from our "ext" directory and from the
      * directory specified in "argo.ext.dir".<p>
      */
     private void huntForModulesFromEx​tensionDir() {
         for (String location : extensionLocations) {
- huntModulesFromNamed​Directory(location);​
+ huntModulesFromNamed​Directory(location);​
         }
     }
 
@@ -522,14 +522,14 @@
             }
 
             try {
- argoHome = java.net.URLDecoder.​decode(argoHome,
+ argoHome = java.net.URLDecoder.​decode(argoHome,
                         Argo.getEncoding());
             } catch (UnsupportedEncodingException e) {
                 //#if defined(LOGGING)
                 //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
                 //@#$LPS-LOGGING:Lo​calization:NestedSta​tement
- LOG.warn("Encoding "
- + Argo.getEncoding()
+ LOG.warn("Encoding "
+ + Argo.getEncoding()
                         + " is unknown.");
                 //#endif
             }
@@ -556,7 +556,7 @@
             extensionLocations.add(extdir);
         }
     }
-
+
     /**
      * Get the list of locations that we've loaded extension modules from.
      * @return A list of the paths we've loaded from.
@@ -626,8 +626,8 @@
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
         //@#$LPS-LOGGING:Lo​calization:StartMeth​od
- LOG.info("Opening jar file " + file);
- //#endif
+ LOG.info("Opening jar file " + file);
+ //#endif
         JarFile jarfile;
     try {
         jarfile = new JarFile(file);
@@ -658,13 +658,13 @@
             //#endif
             return;
         }
-
+
         // TODO: It is a performance drain to load all classes at startup time.
         // They should be lazy loaded when needed. Instead of scanning all
- // classes for ones which implement our loadable module interface, we
+ // classes for ones which implement our loadable module interface, we
         // should use a manifest entry or a special name/name pattern that we
         // look for to find the single main module class to load here. - tfm
-
+
         boolean loadedClass = false;
         if (manifest == null) {
             Enumeration<JarEntry> jarEntries = jarfile.entries();
@@ -702,7 +702,7 @@
     /**
      * Process a JAR file entry, attempting to load anything that looks like a
      * Java class.
- *
+ *
      * @param classloader
      * the classloader to use when loading the class
      * @param cname
@@ -778,7 +778,7 @@
             //#endif
             return false;
         }
-
+
         if (!ModuleInterface.cl​ass.isAssignableFrom​(moduleClass)) {
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:Gr​anularityType:Statem​ent
Messages per page: