Thread: [Gridarta-commit] SF.net SVN: gridarta:[5741] trunk (Page 26)

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

Revision: 5741
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5741&view=rev
Author:   akirschbaum
Date:     2008-11-12 23:48:01 +0000 (Wed, 12 Nov 2008)

Log Message:
-----------
Replace String with File.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeSetLoader.java
    trunk/daimonin/src/daieditor/gameobject/ArchetypeSetLoader.java
    trunk/src/app/net/sf/gridarta/gameobject/face/DefaultFaceObjects.java
    trunk/src/app/net/sf/gridarta/gui/errorview/DefaultErrorView.java
    trunk/src/app/net/sf/gridarta/gui/errorview/ErrorViewCollector.java

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSetLoader.java
===================================================================

--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSetLoader.java	2008-11-12 23:40:45 UTC (rev 5740)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSetLoader.java	2008-11-12 23:48:01 UTC (rev 5741)
@@ -184,7 +184,7 @@
         try {
             animationObjects.loadAnimTree(collectedDirectory, IGUIConstants.ANIMTREE_FILE);
         } catch (final IOException ex) {
-            errorView.addWarning(new File(collectedDirectory, IGUIConstants.ANIMTREE_FILE).getPath(), "can't load file: "+ ex.getMessage());
+            errorView.addWarning(new File(collectedDirectory, IGUIConstants.ANIMTREE_FILE), "can't load file: "+ ex.getMessage());
         }
         loadAnimationsFromCollect(errorView);
         try {
@@ -197,7 +197,7 @@
                 stream.close();
             }
         } catch (final IOException ex) {
-            errorView.addError(new File(collectedDirectory, IGUIConstants.ARCH_FILE).getPath(), ex.getMessage());
+            errorView.addError(new File(collectedDirectory, IGUIConstants.ARCH_FILE), ex.getMessage());
         }
         faceObjects.loadFacesCollection(errorView, collectedDirectory, IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE);
     }

Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSetLoader.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSetLoader.java	2008-11-12 23:40:45 UTC (rev 5740)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSetLoader.java	2008-11-12 23:48:01 UTC (rev 5741)
@@ -204,7 +204,7 @@
         try {
             animationObjects.loadAnimTree(collectedDirectory, IGUIConstants.ANIMTREE_FILE);
         } catch (final IOException ex) {
-            errorView.addError(new File(collectedDirectory, IGUIConstants.ANIMTREE_FILE).getPath(), "can't load file: " + ex.getMessage());
+            errorView.addError(new File(collectedDirectory, IGUIConstants.ANIMTREE_FILE), "can't load file: " + ex.getMessage());
         }
         loadAnimationsFromCollect(errorView);
         try {
@@ -217,7 +217,7 @@
                 stream.close();
             }
         } catch (final IOException ex) {
-            errorView.addError(new File(collectedDirectory, IGUIConstants.ARCH_FILE).getPath(), "can't load file: " + ex.getMessage());
+            errorView.addError(new File(collectedDirectory, IGUIConstants.ARCH_FILE), "can't load file: " + ex.getMessage());
         }
         faceObjects.loadFacesCollection(errorView, collectedDirectory, IGUIConstants.PNG_FILE, IGUIConstants.FACETREE_FILE);
     }

Modified: trunk/src/app/net/sf/gridarta/gameobject/face/DefaultFaceObjects.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/face/DefaultFaceObjects.java	2008-11-12 23:40:45 UTC (rev 5740)
+++ trunk/src/app/net/sf/gridarta/gameobject/face/DefaultFaceObjects.java	2008-11-12 23:48:01 UTC (rev 5741)
@@ -265,7 +265,7 @@
         try {
             tmpFaceFile = IOUtils.getFile(collectedDirectory, faceFile);
         } catch (final IOException ex) {
-            errorView.addError(new File(collectedDirectory, faceFile).getPath(), "can't load file: " + ex.getMessage());
+            errorView.addError(new File(collectedDirectory, faceFile), "can't load file: " + ex.getMessage());
             return;
         }
         final ErrorViewCollector faceFileErrorViewCollector = new ErrorViewCollector(errorView, tmpFaceFile);

Modified: trunk/src/app/net/sf/gridarta/gui/errorview/DefaultErrorView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/errorview/DefaultErrorView.java	2008-11-12 23:40:45 UTC (rev 5740)
+++ trunk/src/app/net/sf/gridarta/gui/errorview/DefaultErrorView.java	2008-11-12 23:48:01 UTC (rev 5741)
@@ -20,6 +20,7 @@
 package net.sf.gridarta.gui.errorview;
 
 import java.awt.Component;
+import java.io.File;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import javax.swing.JButton;
@@ -58,7 +59,7 @@
      * Maps category name to child node.
      */
     @NotNull
-    private final Map<String, ErrorEntry> categories = new IdentityHashMap<String, ErrorEntry>();
+    private final Map<File, ErrorEntry> categories = new IdentityHashMap<File, ErrorEntry>();
 
     /**
      * The parent component for showing the error dialog.
@@ -103,7 +104,7 @@
      * @param categoryName the error category
      * @param message the error message
      */
-    public void addError(@NotNull final String categoryName, @NotNull final String message) {
+    public void addError(@NotNull final File categoryName, @NotNull final String message) {
         final ErrorEntry category = getCategory(categoryName);
         final ErrorEntry errorEntry = new ErrorEntry(treeModel, message, false);
         category.add(errorEntry);
@@ -116,7 +117,7 @@
      * @param categoryName the warning category
      * @param message the warning message
      */
-    public void addWarning(@NotNull final String categoryName, @NotNull final String message) {
+    public void addWarning(@NotNull final File categoryName, @NotNull final String message) {
         final ErrorEntry category = getCategory(categoryName);
         final ErrorEntry errorEntry = new ErrorEntry(treeModel, "Warning: " + message, false);
         category.add(errorEntry);
@@ -129,13 +130,13 @@
      * @return the node
      */
     @NotNull
-    private ErrorEntry getCategory(@NotNull final String category) {
+    private ErrorEntry getCategory(@NotNull final File category) {
         final ErrorEntry existingErrorEntry = categories.get(category);
         if (existingErrorEntry != null) {
             return existingErrorEntry;
         }
 
-        final ErrorEntry errorEntry = new ErrorEntry(treeModel, category, true);
+        final ErrorEntry errorEntry = new ErrorEntry(treeModel, category.getPath(), true);
         categories.put(category, errorEntry);
         treeRoot.add(errorEntry);
         return errorEntry;

Modified: trunk/src/app/net/sf/gridarta/gui/errorview/ErrorViewCollector.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/errorview/ErrorViewCollector.java	2008-11-12 23:40:45 UTC (rev 5740)
+++ trunk/src/app/net/sf/gridarta/gui/errorview/ErrorViewCollector.java	2008-11-12 23:48:01 UTC (rev 5741)
@@ -39,7 +39,7 @@
      * The category name for error messages.
      */
     @NotNull
-    private final String category;
+    private final File category;
 
     /**
      * Creates a new instance.
@@ -48,7 +48,7 @@
      */
     public ErrorViewCollector(@NotNull final DefaultErrorView errorView, @NotNull final File category) {
         this.errorView = errorView;
-        this.category = category.getPath();
+        this.category = category;
     }
 
     /**


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:[5741] trunk (Page 26)

gridarta-commit