Thread: [Gridarta-commit] SF.net SVN: gridarta:[9383] trunk/src/gridarta/src/main/java/net/sf/ gridarta/ma

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9383
          http://sourceforge.net/p/gridarta/code/9383
Author:   akirschbaum
Date:     2013-10-05 16:12:08 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
Extract code into functions.

Modified Paths:
--------------
    trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/DefaultMainControl.java

Modified: trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/DefaultMainControl.java
===================================================================

--- trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/DefaultMainControl.java	2013-10-05 15:39:52 UTC (rev 9382)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/DefaultMainControl.java	2013-10-05 16:12:08 UTC (rev 9383)
@@ -201,11 +201,13 @@
             final ValidatorFactory<G, A, R> validatorFactory = new ValidatorFactory<G, A, R>(validatorPreferences, gameObjectMatchers, projectSettings, mapWriter);
             loadValidators(validators, validatorFactory, errorView);
             attributeRangeChecker = editorFactory.loadAttributeRangeChecker(validators, gameObjectMatchersErrorViewCollector, projectSettings, gameObjectMatchers, validatorPreferences);
-            validators.addValidator(attributeRangeChecker);
-            validators.addValidator(environmentChecker);
         } catch (final FileNotFoundException ex) {
             errorView.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID, "GameObjectMatchers.xml: " + ex.getMessage());
         }
+        if (attributeRangeChecker != null) {
+            validators.addValidator(attributeRangeChecker);
+        }
+        validators.addValidator(environmentChecker);
         final GameObjectMatcher shopSquareMatcher = gameObjectMatchers.getMatcher("system_shop_square", "shop_square");
         if (shopSquareMatcher != null) {
             final GameObjectMatcher noSpellsMatcher = gameObjectMatchers.getMatcher("system_no_spells", "no_spells");
@@ -219,34 +221,7 @@
                 validators.addValidator(new PaidItemShopSquareChecker<G, A, R>(validatorPreferences, shopSquareMatcher, paidItemMatcher));
             }
         }
-        Map<String, TreasureTreeNode> specialTreasureLists;
-        try {
-            final URL url = IOUtils.getResource(projectSettings.getConfigurationDirectory(), "TreasureLists.xml");
-            final ErrorViewCollector treasureListsErrorViewCollector = new ErrorViewCollector(errorView, url);
-            try {
-                final InputStream inputStream = url.openStream();
-                try {
-                    documentBuilder.setErrorHandler(new ErrorViewCollectorErrorHandler(treasureListsErrorViewCollector, ErrorViewCategory.TREASURES_FILE_INVALID));
-                    try {
-                        final Document specialTreasureListsDocument = documentBuilder.parse(new InputSource(inputStream));
-                        specialTreasureLists = TreasureListsParser.parseTreasureLists(specialTreasureListsDocument);
-                    } finally {
-                        documentBuilder.setErrorHandler(null);
-                    }
-                } finally {
-                    inputStream.close();
-                }
-            } catch (final IOException ex) {
-                treasureListsErrorViewCollector.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, ex.getMessage());
-                specialTreasureLists = Collections.emptyMap();
-            } catch (final SAXException ex) {
-                treasureListsErrorViewCollector.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, ex.getMessage());
-                specialTreasureLists = Collections.emptyMap();
-            }
-        } catch (final FileNotFoundException ex) {
-            errorView.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, "TreasureLists.xml: " + ex.getMessage());
-            specialTreasureLists = Collections.emptyMap();
-        }
+        final Map<String, TreasureTreeNode> specialTreasureLists = loadSpecialTreasureLists(errorView, documentBuilder, projectSettings);
         final ConfigSource configSource = forceReadFromFiles ? configSourceFactory.getFilesConfigSource() : configSourceFactory.getConfigSource(projectSettings.getConfigSourceName());
         treasureTree = TreasureLoader.parseTreasures(errorView, specialTreasureLists, configSource, projectSettings);
         final ArchetypeAttributeFactory archetypeAttributeFactory = new DefaultArchetypeAttributeFactory();
@@ -285,17 +260,7 @@
             log.info("Start to load archetypes...");
         }
         configSource.read(projectSettings, resources, errorView);
-        for (final R archetype : archetypeSet.getArchetypes()) {
-            final CharSequence editorFolder = archetype.getEditorFolder();
-            if (editorFolder != null && !editorFolder.equals(GameObject.EDITOR_FOLDER_INTERN)) {
-                final String[] tmp = StringUtils.PATTERN_SLASH.split(editorFolder, 2);
-                if (tmp.length == 2) {
-                    final String panelName = tmp[0];
-                    final String folderName = tmp[1];
-                    archetypeChooserModel.addArchetype(panelName, folderName, archetype);
-                }
-            }
-        }
+        addArchetypes(archetypeChooserModel, archetypeSet);
         if (log.isInfoEnabled()) {
             log.info("Archetype loading took " + (double) (System.currentTimeMillis() - timeStart) / 1000.0 + " seconds.");
         }
@@ -323,6 +288,53 @@
         }
     }
 
+    private void addArchetypes(@NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final ArchetypeSet<G, A, R> archetypeSet) {
+        for (final R archetype : archetypeSet.getArchetypes()) {
+            final CharSequence editorFolder = archetype.getEditorFolder();
+            if (editorFolder != null && !editorFolder.equals(GameObject.EDITOR_FOLDER_INTERN)) {
+                final String[] tmp = StringUtils.PATTERN_SLASH.split(editorFolder, 2);
+                if (tmp.length == 2) {
+                    final String panelName = tmp[0];
+                    final String folderName = tmp[1];
+                    archetypeChooserModel.addArchetype(panelName, folderName, archetype);
+                }
+            }
+        }
+    }
+
+    @NotNull
+    private Map<String, TreasureTreeNode> loadSpecialTreasureLists(@NotNull final ErrorView errorView, @NotNull final DocumentBuilder documentBuilder, @NotNull final ProjectSettings projectSettings) {
+        Map<String, TreasureTreeNode> specialTreasureLists;
+        try {
+            final URL url = IOUtils.getResource(projectSettings.getConfigurationDirectory(), "TreasureLists.xml");
+            final ErrorViewCollector treasureListsErrorViewCollector = new ErrorViewCollector(errorView, url);
+            try {
+                final InputStream inputStream = url.openStream();
+                try {
+                    documentBuilder.setErrorHandler(new ErrorViewCollectorErrorHandler(treasureListsErrorViewCollector, ErrorViewCategory.TREASURES_FILE_INVALID));
+                    try {
+                        final Document specialTreasureListsDocument = documentBuilder.parse(new InputSource(inputStream));
+                        specialTreasureLists = TreasureListsParser.parseTreasureLists(specialTreasureListsDocument);
+                    } finally {
+                        documentBuilder.setErrorHandler(null);
+                    }
+                } finally {
+                    inputStream.close();
+                }
+            } catch (final IOException ex) {
+                treasureListsErrorViewCollector.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, ex.getMessage());
+                specialTreasureLists = Collections.emptyMap();
+            } catch (final SAXException ex) {
+                treasureListsErrorViewCollector.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, ex.getMessage());
+                specialTreasureLists = Collections.emptyMap();
+            }
+        } catch (final FileNotFoundException ex) {
+            errorView.addWarning(ErrorViewCategory.TREASURES_FILE_INVALID, "TreasureLists.xml: " + ex.getMessage());
+            specialTreasureLists = Collections.emptyMap();
+        }
+        return specialTreasureLists;
+    }
+
     /**
      * Creates map validators from preferences.
      * @param validators the validators to add the newly created validators to

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Gridarta-commit] SF.net SVN: gridarta:[9383] trunk/src/gridarta/src/main/java/net/sf/ gridarta/ma

gridarta-commit