Changeset 149:bec178c2bb59

Timestamp:

08/10/2008 10:37:49 PM (4 months ago)

Author:

marc@f1.local

branch:

default

Message:

fix for #93

Files:

• development/java/field/bytecode/protect/Trampoline2.java (modified) (6 diffs)
• development/java/field/core/windowing/components/RootComponent.java (modified) (2 diffs)
• distribution/application/.DS_Store (modified) (previous)

development/java/field/bytecode/protect/Trampoline2.java

@@ -254 +254 @@
-
-        public void addExtensionsDirectory(File path) {
+
-                if (path.exists()) {
-
@@ -312 +313 @@
-                                        Manifest m = new Manifest(new BufferedInputStream(new FileInputStream(j)));
-                                        String aa = (String) m.getMainAttributes().get(new Attributes.Name("Field-RedirectionPath"));
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                for (String a : aa.split(":")) {
-                                                        a = a.trim();
@@ -319 +349 @@
-
-                                                                if (!new File(fp).exists()) {
-+j+
+ + j + 
-                                                                }
-                                                                URL url = new URL("file://" + fp + (fp.endsWith(".jar") ? "" : "/"));
-
+
-                                                                loader.addURL(url);
-
@@ -393 +423 @@
-                trampoline = this;
-
-                
-                String exceptions = SystemProperties.getProperty("trampolineExceptions", null);
-
-
-
-
-
+
+
+
+
-                        ArrayList a = new ArrayList(Arrays.asList(ignored));
-                        a.addAll(Arrays.asList(exceptions.split(":")));
@@ -418 +446 @@
-                String extensionsDir = SystemProperties.getProperty("extensions.dir", "../../../../extensions/");
-                Trampoline2.trampoline.addExtensionsDirectory(new File(extensionsDir));
-
+
-                try {
-                        final Class c = (loader.loadClass(classToLaunch));
@@ -444 +472 @@
-                                        try {
-
-+Thread.currentThread()+
+ + Thread.currentThread() + 
-                                                Launcher.getLauncher().mainThread = Thread.currentThread();
-                                                printInfo();

development/java/field/core/windowing/components/RootComponent.java

@@ -118 +118 @@
-                                return;
-
-
+//
-
-                        RootComponent.this.handleResize(currentResize, dx, dy, arg0.getX(), arg0.getY());
-
-
+//
-                        // need to rexpress lx in light
-                        // of the potentially new
@@ -133 +133 @@
-                        lastX = (mv.x) - (lx2 - lx);
-                        lastY = (mv.y) - (ly2 - ly);
-
+
-                        GLComponentWindow.getCurrentWindow(RootComponent.this).transformMouseEvent(arg0);
-