notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2177 - in development/laboratory/ide/eclipse/magic/plugin: . src/net/dpml/ide/eclipse/plugins/magic

From: peter AT neubauer.se
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2177 - in development/laboratory/ide/eclipse/magic/plugin: . src/net/dpml/ide/eclipse/plugins/magic
Date: Wed, 30 Mar 2005 17:36:52 -0500

Author: peter AT neubauer.se
Date: Wed Mar 30 17:36:50 2005
New Revision: 2177

Modified:
development/laboratory/ide/eclipse/magic/plugin/.classpath
development/laboratory/ide/eclipse/magic/plugin/build.properties
development/laboratory/ide/eclipse/magic/plugin/plugin.xml

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/MagicClasspathInitializer.java

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

development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicPlugin.java
Log:
minor fixes due to jar renaming

Modified: development/laboratory/ide/eclipse/magic/plugin/.classpath
==============================================================================
--- development/laboratory/ide/eclipse/magic/plugin/.classpath (original)
+++ development/laboratory/ide/eclipse/magic/plugin/.classpath Wed Mar 30
17:36:50 2005
@@ -1,11 +1,12 @@
-<?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-main.jar"/>
- <classpathentry exported="true" kind="lib"
path="lib/dpml-transit-tools.jar"/>
- <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>
+<?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>

Modified: development/laboratory/ide/eclipse/magic/plugin/build.properties
==============================================================================
--- development/laboratory/ide/eclipse/magic/plugin/build.properties
(original)
+++ development/laboratory/ide/eclipse/magic/plugin/build.properties Wed
Mar 30 17:36:50 2005
@@ -1,10 +1,11 @@
-source.MagicPlugin.jar = src/
-output.MagicPlugin.jar = bin/
bin.includes = plugin.xml,\
- MagicPlugin.jar,\
resources/,\
lib/,\
bin/,\
META-INF/,\
- help/
+ help/,\
+ MagicPlugin.jar
jars.compile.order = MagicPlugin.jar
+source.MagicPlugin.jar = src/,\
+ bin/
+output.MagicPlugin.jar = bin/

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 Wed Mar 30
17:36:50 2005
@@ -7,24 +7,21 @@
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>
<library name="lib/dpml-magic-core-SNAPSHOT.jar">
<export name="*"/>
</library>
- <library name="lib/dpml-transit-main.jar">
- <export name="*"/>
- </library>
<library name="lib/dpml-transit-tools.jar">
<export name="*"/>
</library>
<library name="lib/junit-3.8.1.jar">
<export name="*"/>
</library>
+ <library name="lib/dpml-transit-main-SNAPSHOT.jar">
+ <export name="*"/>
+ </library>
</runtime>

<requires>
@@ -54,7 +51,7 @@
<scope name="project"
class="org.eclipse.core.internal.resources.ProjectPreferences"/>
</extension>

-<extension point = "org.eclipse.ui.popupMenus">
+ <extension point = "org.eclipse.ui.popupMenus">
<objectContribution
id="net.dpml.ide.eclipse.plugins.magic.indextool"
objectClass="org.eclipse.core.resources.IFile"
@@ -80,27 +77,8 @@
<extension point="org.eclipse.help.toc">
<toc file="help/toc_Tasks.xml" />
</extension>
- 
+ </extension>
</plugin>

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
Wed Mar 30 17:36:50 2005
@@ -56,7 +56,7 @@
this( "Index Action" );
}

- private ILog log = MagicPlugin.getDefault().getLog(); ;
+ private ILog log = MagicPlugin.getDefault().getLog();

private IResource mIndexFile;

Modified:
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicClasspathInitializer.java
==============================================================================
---
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicClasspathInitializer.java
(original)
+++
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicClasspathInitializer.java
Wed Mar 30 17:36:50 2005
@@ -23,9 +23,6 @@
import org.eclipse.jdt.core.IClasspathContainer;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.launching.JREContainer;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.JavaRuntime;

public class MagicClasspathInitializer extends ClasspathContainerInitializer
{

Modified:
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
==============================================================================
---
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
(original)
+++
development/laboratory/ide/eclipse/magic/plugin/src/net/dpml/ide/eclipse/plugins/magic/MagicContainer.java
Wed Mar 30 17:36:50 2005
@@ -18,7 +18,6 @@
package net.dpml.ide.eclipse.plugins.magic;

import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -79,11 +78,6 @@
private IFile m_indexFile;

/**
- * the current java project
- */
- private IJavaProject m_javaProject;
-
- /**
* the eclipse resource project
*/
private IProject m_reosurceProject;
@@ -98,7 +92,6 @@
*/
public MagicContainer( IJavaProject project, IPath containerPath )
{
- this.m_javaProject = project;
m_log = MagicPlugin.getDefault().getLog();
m_log.log( new Status( Status.INFO, "net.dpml.MagicPlugin", 0,
"ContainerPath: " + containerPath, null ) );
@@ -176,7 +169,7 @@
* @see org.eclipse.jdt.core.IClasspathContainer#getClasspathEntries()
*/
public IClasspathEntry[] getClasspathEntries()
- {
+ {
if ( m_index == null )
{
return null;
@@ -191,20 +184,10 @@
e.printStackTrace();
}
TreeMap collectedDeps = new TreeMap();
- TreeMap collectedSources = new TreeMap();
IdeProjectDefinition[] projects = m_index.getProjectDefinitions();
for ( int i = 0; i < projects.length; i++ )
{
IdeProjectDefinition project = projects[i];
- try
- {
- String basedir = project.getFullBaseDir().getCanonicalPath();
- }
- catch ( IOException e )
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
IdeDependency[] deps = project.getDependencies();
for ( int k = 0; k < deps.length; k++ )
{
@@ -243,8 +226,6 @@
{
if ( dependency.isProjectDefinition() )
{
- IdeProjectDefinition projectDependency =
(IdeProjectDefinition) dependency;
- resolvedPath = null;
}
else
{

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
Wed Mar 30 17:36:50 2005
@@ -1,12 +1,9 @@
package net.dpml.ide.eclipse.plugins.magic;

-import java.io.IOException;
import java.util.Hashtable;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

-import net.dpml.transit.TransitException;
-
import org.eclipse.ant.core.AntCorePlugin;
import org.eclipse.ant.core.AntCorePreferences;
import org.eclipse.ant.core.IAntClasspathEntry;
@@ -81,7 +78,7 @@
try
{
transitClasspath[0] = new AntClasspathEntry( pluginPath
- + "lib/dpml-transit-main.jar" );
+ + "lib/dpml-transit-main-SNAPSHOT.jar" );
transitClasspath[1] = new AntClasspathEntry( pluginPath
+ "lib/dpml-transit-tools.jar" );
transitClasspath[2] = new AntClasspathEntry( pluginPath

svn commit: r2177 - in development/laboratory/ide/eclipse/magic/plugin: . src/net/dpml/ide/eclipse/plugins/magic, peter, 03/30/2005