[Gridarta-commit] SF.net SVN: gridarta:[9407] trunk/src/gridarta/src/main/java/net/sf/ gridarta/maincontrol/DefaultMainControl.java

[<aki...@us...>]

Revision: 9407
          http://sourceforge.net/p/gridarta/code/9407
Author:   akirschbaum
Date:     2013-10-08 21:28:43 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
Extract code into function.

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-08 21:25:06 UTC (rev 9406)
+++ trunk/src/gridarta/src/main/java/net/sf/gridarta/maincontrol/DefaultMainControl.java	2013-10-08 21:28:43 UTC (rev 9407)
@@ -19,6 +19,7 @@
 
 package net.sf.gridarta.maincontrol;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -110,23 +111,11 @@
         final EnvironmentChecker<G, A, R> environmentChecker = new EnvironmentChecker<G, A, R>(validatorPreferences);
         AttributeRangeChecker<G, A, R> attributeRangeChecker = null;
         try {
-            final URL url = IOUtils.getResource(projectSettings.getConfigurationDirectory(), "GameObjectMatchers.xml");
-            final ErrorViewCollector gameObjectMatchersErrorViewCollector = new ErrorViewCollector(errorView, url);
-            try {
-                xmlHelper.getDocumentBuilder().setErrorHandler(new ErrorViewCollectorErrorHandler(gameObjectMatchersErrorViewCollector, ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID));
-                try {
-                    final GameObjectMatchersParser gameObjectMatchersParser = new GameObjectMatchersParser(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
-                    gameObjectMatchersParser.readGameObjectMatchers(url, gameObjectMatchers, gameObjectMatchersErrorViewCollector);
-                } finally {
-                    xmlHelper.getDocumentBuilder().setErrorHandler(null);
-                }
-            } catch (final IOException ex) {
-                gameObjectMatchersErrorViewCollector.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID, ex.getMessage());
-            }
+            loadGameObjectMatchers(xmlHelper, errorView, projectSettings, gameObjectMatchers);
 
             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);
+            attributeRangeChecker = editorFactory.loadAttributeRangeChecker(validators, new ErrorViewCollector(errorView, new File("GamEObjectMatchers.xml")), projectSettings, gameObjectMatchers, validatorPreferences);
         } catch (final FileNotFoundException ex) {
             errorView.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID, "GameObjectMatchers.xml: " + ex.getMessage());
         }
@@ -150,6 +139,22 @@
         }
     }
 
+    private void loadGameObjectMatchers(@NotNull final XmlHelper xmlHelper, @NotNull final ErrorView errorView, @NotNull final ProjectSettings projectSettings, @NotNull final GameObjectMatchers gameObjectMatchers) throws FileNotFoundException {
+        final URL url = IOUtils.getResource(projectSettings.getConfigurationDirectory(), "GameObjectMatchers.xml");
+        final ErrorViewCollector gameObjectMatchersErrorViewCollector = new ErrorViewCollector(errorView, url);
+        try {
+            xmlHelper.getDocumentBuilder().setErrorHandler(new ErrorViewCollectorErrorHandler(gameObjectMatchersErrorViewCollector, ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID));
+            try {
+                final GameObjectMatchersParser gameObjectMatchersParser = new GameObjectMatchersParser(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
+                gameObjectMatchersParser.readGameObjectMatchers(url, gameObjectMatchers, gameObjectMatchersErrorViewCollector);
+            } finally {
+                xmlHelper.getDocumentBuilder().setErrorHandler(null);
+            }
+        } catch (final IOException ex) {
+            gameObjectMatchersErrorViewCollector.addWarning(ErrorViewCategory.GAMEOBJECTMATCHERS_FILE_INVALID, ex.getMessage());
+        }
+    }
+
     @NotNull
     public static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> ScriptArchUtils loadScriptArchUtils(@NotNull final ErrorView errorView, final EditorFactory<G, A, R> editorFactory, @NotNull final ProjectSettings projectSettings, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final XmlHelper xmlHelper) {
         final ArchetypeAttributeFactory archetypeAttributeFactory = new DefaultArchetypeAttributeFactory();

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