Changeset 1275

Timestamp:

03/07/10 08:45:47 (5 months ago)

Author:

dreisch

Message:

-fixed #1104

Location:

ide/trunk/src

Files:

• org/korsakow/ide/ui/controller/EventEditorController.java (modified) (1 diff)
• org/korsakow/ide/util/Util.java (modified) (6 diffs)
• resources/ui/eventmappings.properties (moved) (moved from ide/trunk/src/resources/ui/EventMapping.properties)

ide/trunk/src/org/korsakow/ide/ui/controller/EventEditorController.java

@@ -45 +45 @@
                 try {
                         Properties eventProperties = new Properties();
-                        eventProperties.load(ResourceManager.getResourceStream(UIResourceManager.UIRESOURCE_BASE_PATH + '/' + "EventMapping.properties"));
+                        eventProperties.load(ResourceManager.getResourceStream(UIResourceManager.UIRESOURCE_BASE_PATH + "eventmappings.properties"));
                         for (Object key : eventProperties.keySet()) {
                                 String value = eventProperties.getProperty(key.toString());

ide/trunk/src/org/korsakow/ide/util/Util.java

@@ -7 +7 @@
 import java.io.StringWriter;
 import java.lang.ref.WeakReference;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -92 +91 @@
                         // instantiating and casting like this is possible becaus of type-erasure in generics
                         // otherwise i guess there would have to be some related functionality in the Class api
-                        Collection<T> references = (Collection<T>)weakCollection.getClass().newInstance();
+                        Collection<T> references = weakCollection.getClass().newInstance();
                         for (WeakReference<T> ref : weakCollection)
                         {
@@ -137 +136 @@
          * @throws IOException
          */
+        @Deprecated
         public static void writeDom(Document doc, File file) throws TransformerException, IOException
         {
@@ -159 +159 @@
          * @throws IOException
          */
+        @Deprecated
         public static Process shellExecute(String cmd, File dir) throws IOException
         {
@@ -170 +171 @@
          * @throws IOException
          */
+        @Deprecated
         public static Process shellExecute(List<String> cmds, File dir) throws IOException
         {
@@ -183 +185 @@
                 PrintWriter pw = new PrintWriter(sw);
                 t.printStackTrace(pw);
-                return sw.toString();
+                String trace = sw.toString();
+                if (t.getCause() != null)
+                        trace += "\nCause:\n" + getStackTraceString(t.getCause());
+                return trace;
         }
         /**