notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2244 - in development/laboratory/ide/eclipse/magic: features plugin plugin/lib plugin/src/net/dpml/ide/eclipse/plugins/magic update

From: peter AT neubauer.se
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2244 - in development/laboratory/ide/eclipse/magic: features plugin plugin/lib plugin/src/net/dpml/ide/eclipse/plugins/magic update
Date: Fri, 08 Apr 2005 02:29:38 -0400

Author: peter AT neubauer.se
Date: Fri Apr 8 02:29:35 2005
New Revision: 2244

Modified:
development/laboratory/ide/eclipse/magic/features/feature.xml
development/laboratory/ide/eclipse/magic/plugin/.classpath

development/laboratory/ide/eclipse/magic/plugin/lib/dpml-transit-main-SNAPSHOT.jar
development/laboratory/ide/eclipse/magic/plugin/lib/dpml-transit-tools.jar
development/laboratory/ide/eclipse/magic/plugin/plugin.xml

development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/ArtifactURLHandler.java

development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java

development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicPlugin.java
development/laboratory/ide/eclipse/magic/update/site.xml
Log:
fixed ide hangs

Modified: development/laboratory/ide/eclipse/magic/features/feature.xml
==============================================================================
--- development/laboratory/ide/eclipse/magic/features/feature.xml
(original)
+++ development/laboratory/ide/eclipse/magic/features/feature.xml Fri
Apr 8 02:29:35 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="net.dpml.ide.eclipse.Magic"
+ id="net.dpml.ide.eclipse.plugins.Magic"
label="magic-eclipse-feature"
version="0.1.91">

@@ -43,7 +43,8 @@
* limitations under the License.
*/
</license>
- <requires>
+
+ <requires>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.jdt"/>

Modified: development/laboratory/ide/eclipse/magic/plugin/.classpath
==============================================================================
--- development/laboratory/ide/eclipse/magic/plugin/.classpath (original)
+++ development/laboratory/ide/eclipse/magic/plugin/.classpath Fri Apr 8
02:29:35 2005
@@ -1,12 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib"
path="lib/dpml-ide-common-magic-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib"
path="lib/dpml-magic-core-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib"
path="lib/dpml-transit-tools.jar"/>
- <classpathentry exported="true" kind="lib"
path="lib/junit-3.8.1.jar"/>
- <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/dpml-transit-main-SNAPSHOT.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry exported="true" kind="lib"
path="lib/dpml-ide-common-magic-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/dpml-magic-core-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/dpml-transit-tools.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/junit-3.8.1.jar"/>
+ <classpathentry exported="true" kind="lib"
path="lib/dpml-transit-main-SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>

Modified:
development/laboratory/ide/eclipse/magic/plugin/lib/dpml-transit-main-SNAPSHOT.jar
==============================================================================
Binary files. No diff available.

Modified:
development/laboratory/ide/eclipse/magic/plugin/lib/dpml-transit-tools.jar
==============================================================================
Binary files. No diff available.

Modified: development/laboratory/ide/eclipse/magic/plugin/plugin.xml
==============================================================================
--- development/laboratory/ide/eclipse/magic/plugin/plugin.xml (original)
+++ development/laboratory/ide/eclipse/magic/plugin/plugin.xml Fri Apr 8
02:29:35 2005
@@ -7,6 +7,9 @@
provider-name="DPML"
class="net.dpml.ide.eclipse.plugins.magic.MagicPlugin">
<runtime>
+ <library name="MagicPlugin.jar">
+ <export name="*"/>
+ </library>
<library name="lib/dpml-ide-common-magic-SNAPSHOT.jar">
<export name="*"/>
</library>

Modified:
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/ArtifactURLHandler.java
==============================================================================
---
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/ArtifactURLHandler.java
(original)
+++
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/ArtifactURLHandler.java
Fri Apr 8 02:29:35 2005
@@ -23,77 +23,81 @@
/**
* URL handler for the "artifact" protocol
*/
-public class ArtifactURLHandler extends Handler implements
URLStreamHandlerService
+public class ArtifactURLHandler extends Handler implements
+ URLStreamHandlerService
{
- public static final String PROTOCOL = "artifact";
+ public static final String PROTOCOL = "artifact";

- public ArtifactURLHandler() throws IOException
- {
- super();
- }
-
- public URLConnection openConnection(URL u) throws IOException {
- return super.openConnection( u );
- }
-
- public void parseURL(URLStreamHandlerSetter realHandler, URL u,
String spec, int start, int limit) {
- super.parseURL( u, spec, start, limit );
- }
-
- /**
- * @see "java.net.URLStreamHandler.toExternalForm"
- */
- public String toExternalForm(URL u )
- {
- return super.toExternalForm( u );
- }
-
- /**
- * @see "java.net.URLStreamHandler.equals(URL, URL)"
- */
- public boolean equals(URL u1, URL u2)
- {
- return super.equals( u1, u2 );
- }
-
- /**
- * @see "java.net.URLStreamHandler.getDefaultPort"
- */
- public int getDefaultPort()
- {
- return super.getDefaultPort();
- }
-
- /**
- * @see "java.net.URLStreamHandler.getHostAddress"
- */
- public InetAddress getHostAddress( URL u )
- {
- return super.getHostAddress( u );
- }
-
- /**
- * @see "java.net.URLStreamHandler.hashCode(URL)"
- */
- public int hashCode(URL u)
- {
- return super.hashCode(u);
- }
-
- /**
- * @see "java.net.URLStreamHandler.hostsEqual"
- */
- public boolean hostsEqual(URL u1, URL u2)
- {
- return super.hostsEqual(u1, u2);
- }
-
- /**
- * @see "java.net.URLStreamHandler.sameFile"
- */
- public boolean sameFile(URL u1, URL u2)
- {
- return super.sameFile(u1, u2);
- }
+ public ArtifactURLHandler() throws IOException
+ {
+ super();
+ }
+
+ public URLConnection openConnection( URL u ) throws IOException
+ {
+ return super.openConnection( u );
+ }
+
+ public void parseURL( URLStreamHandlerSetter realHandler, URL u,
+ String spec, int start, int limit )
+ {
+ super.parseURL( u, spec, start, limit );
+ }
+
+ /**
+ * @see "java.net.URLStreamHandler.toExternalForm"
+ */
+ public String toExternalForm( URL u )
+ {
+ return super.toExternalForm( u );
+ }
+
+ /**
+ * @see "java.net.URLStreamHandler.equals(URL, URL)"
+ */
+ public boolean equals( URL u1, URL u2 )
+ {
+ return super.equals( u1, u2 );
+ }
+
+ /**
+ * @see "java.net.URLStreamHandler.getDefaultPort"
+ */
+ public int getDefaultPort()
+ {
+ return super.getDefaultPort();
+ }
+
+ /**
+ * @see "java.net.URLStreamHandler.getHostAddress"
+ */
+ public InetAddress getHostAddress( URL u )
+ {
+ return super.getHostAddress( u );
+ }
+
+ /**
+ * @see "java.net.URLStreamHandler.hashCode(URL)"
+ */
+ public int hashCode( URL u )
+ {
+ return super.hashCode( u );
+ }
+
+ /**
+ * @see "java.net.URLStreamHandler.hostsEqual"
+ */
+ public boolean hostsEqual( URL u1, URL u2 )
+ {
+ return super.hostsEqual( u1, u2 );
+ }
+
+ /**
+ * @see "java.net.URLStreamHandler.sameFile"
+ */
+ public boolean sameFile( URL u1, URL u2 )
+ {
+ return super.sameFile( u1, u2 );
+ }

}
\ No newline at end of file

Modified:
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java
==============================================================================
---
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java
(original)
+++
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/IndexActionDelegate.java
Fri Apr 8 02:29:35 2005
@@ -169,8 +169,8 @@
}
catch ( CoreException e1 )
{
- // TODO Auto-generated catch block
- e1.printStackTrace();
+ log.log( new Status( Status.ERROR, "net.dpml.MagicPlugin", 0,
+ "Could not initialize MagicContainer 0", e1 ) );
}// = proj;
try
{
@@ -178,8 +178,8 @@
}
catch ( JavaModelException e )
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.log( new Status( Status.ERROR, "net.dpml.MagicPlugin", 0,
+ "Could not initialize MagicContainer 1", e ) );
}
}

Modified:
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicPlugin.java
==============================================================================
---
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicPlugin.java
(original)
+++
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicPlugin.java
Fri Apr 8 02:29:35 2005
@@ -57,7 +57,7 @@
public void start( BundleContext context ) throws Exception
{
super.start( context );
- registerArtifactHandler( context );
+ //registerArtifactHandler( context );

fixAntClasspath();
}

Modified: development/laboratory/ide/eclipse/magic/update/site.xml
==============================================================================
--- development/laboratory/ide/eclipse/magic/update/site.xml (original)
+++ development/laboratory/ide/eclipse/magic/update/site.xml Fri Apr 8
02:29:35 2005
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/net.dpml.ide.eclipse.Magic_0.1.91.jar"
id="net.dpml.ide.eclipse.Magic" version="0.1.91">
- <category name="Magic"/>
- </feature>
- <category-def name="Magic" label="DPML Magic Plugin">
- <description>
- The DPML Magic Eclipse plugin
- </description>
- </category-def>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/net.dpml.ide.eclipse.plugins.Magic_0.1.91.jar"
id="net.dpml.ide.eclipse.plugins.Magic" version="0.1.91">
+ <category name="Magic"/>
+ </feature>
+ <category-def name="Magic" label="DPML Magic Plugin">
+ <description>
+ The DPML Magic Eclipse plugin
+ </description>
+ </category-def>
+</site>

svn commit: r2244 - in development/laboratory/ide/eclipse/magic: features plugin plugin/lib plugin/src/net/dpml/ide/eclipse/plugins/magic update, peter, 04/07/2005