notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2263 - in development/laboratory/ide/eclipse: org.apache.avalon.ide.eclipse.core org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/merlin/core org.apache.avalon.ide.eclipse.launch org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch org.apache.avalon.ide.eclipse.ui org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards

From: peter AT neubauer.se
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2263 - in development/laboratory/ide/eclipse: org.apache.avalon.ide.eclipse.core org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/merlin/core org.apache.avalon.ide.eclipse.launch org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch org.apache.avalon.ide.eclipse.ui org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards
Date: Mon, 11 Apr 2005 01:48:23 -0400

Author: peter AT neubauer.se
Date: Mon Apr 11 01:48:23 2005
New Revision: 2263

Modified:

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/.classpath

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/build.properties

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/merlin/core/MerlinDeveloperCore.java

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/.classpath

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/build.properties

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/MerlinDeveloperLaunch.java

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/.classpath

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/build.properties

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/MerlinDeveloperUI.java

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools/JavadocProcessor.java

development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinProjectSelectionPage.java
Log:
some formatting stuff and fixed a bug - the whole thing is working now with
new Projects!

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/.classpath
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/.classpath
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/.classpath
Mon Apr 11 01:48:23 2005
@@ -1,13 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="lib" path="lib/xstream-0.2.jar"/>
- <classpathentry kind="lib" path="lib/xdoclet-1.2b4.jar"/>
- <classpathentry kind="lib" path="lib/xjavadoc-1.0.jar"/>
- <classpathentry kind="lib" path="lib/commons-collections-2.0.jar"/>
- <classpathentry kind="lib" path="lib/commons-lang.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging.jar"/>
- <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="bin">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/xstream-0.2.jar">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/xdoclet-1.2b4.jar">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/xjavadoc-1.0.jar">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/commons-collections-2.0.jar">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/commons-lang.jar">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/commons-logging.jar">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/build.properties
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/build.properties
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/build.properties
Mon Apr 11 01:48:23 2005
@@ -4,8 +4,10 @@
lib/,\
docs/,\
toc.xml
-source.MerlinDeveloperCore.jar = src/
+source.MerlinDeveloperCore.jar = src/,\
+ bin/
src.includes = src/,\
toc.xml,\
plugin.xml,\
docs/
+output.MerlinDeveloperCore.jar = bin/

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/merlin/core/MerlinDeveloperCore.java
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/merlin/core/MerlinDeveloperCore.java
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/merlin/core/MerlinDeveloperCore.java
Mon Apr 11 01:48:23 2005
@@ -1,19 +1,19 @@
/*
-
- Copyright 2004. The Apache Software Foundation.
+
+ Copyright 2004. The Apache Software Foundation.

- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
*/
package org.apache.avalon.ide.eclipse.merlin.core;

@@ -25,6 +25,7 @@
import org.eclipse.core.runtime.IPluginDescriptor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.IStartup;
import org.eclipse.ui.plugin.AbstractUIPlugin;

/**
@@ -34,91 +35,92 @@
*/
public class MerlinDeveloperCore extends AbstractUIPlugin
{
- //The shared instance.
+ // The shared instance.
private static MerlinDeveloperCore plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;

- public static final String PLUGIN_ID =
"org.apache.avalon.MerlinDeveloperCore";
+ // Resource bundle.
+ private ResourceBundle resourceBundle;
+
+ public static final String PLUGIN_ID =
"org.apache.avalon.MerlinDeveloperCore";

/**
- * The constructor.
- */
- public MerlinDeveloperCore(IPluginDescriptor descriptor)
- {
- super(descriptor);
- plugin = this;
- try
+ * The constructor.
+ */
+ public MerlinDeveloperCore( IPluginDescriptor descriptor )
{
- resourceBundle =
- ResourceBundle.getBundle(
-
"org.apache.avalon.ide.eclipse.merlin.core.MerlinDeveloperCoreResources");
- } catch (MissingResourceException x)
- {
- resourceBundle = null;
+ super( descriptor );
+ plugin = this;
+ try
+ {
+ resourceBundle = ResourceBundle
+ .getBundle(
"org.apache.avalon.ide.eclipse.merlin.core.MerlinDeveloperCoreResources" );
+ }
+ catch ( MissingResourceException x )
+ {
+ resourceBundle = null;
+ }
}
- }

/**
- * Returns the shared instance.
- */
+ * Returns the shared instance.
+ */
public static MerlinDeveloperCore getDefault()
{
return plugin;
}

/**
- * Returns the workspace instance.
- */
+ * Returns the workspace instance.
+ */
public static IWorkspace getWorkspace()
{
return ResourcesPlugin.getWorkspace();
}

/**
- * Returns the string from the plugin's resource bundle, or 'key' if
not
- * found.
- */
- public static String getResourceString(String key)
+ * Returns the string from the plugin's resource bundle, or 'key' if not
+ * found.
+ */
+ public static String getResourceString( String key )
{
- ResourceBundle bundle =
MerlinDeveloperCore.getDefault().getResourceBundle();
+ ResourceBundle bundle = MerlinDeveloperCore.getDefault()
+ .getResourceBundle();
try
{
- return (bundle != null ? bundle.getString(key) : key);
- } catch (MissingResourceException e)
+ return ( bundle != null ? bundle.getString( key ) : key );
+ }
+ catch ( MissingResourceException e )
{
return key;
}
}

/**
- * Returns the plugin's resource bundle, @uml property=resourceBundle
- */
+ * Returns the plugin's resource bundle,
+ *
+ * @uml property=resourceBundle
+ */
public ResourceBundle getResourceBundle()
{
return resourceBundle;
}

- public static void log(IStatus status)
+ public static void log( IStatus status )
{
- getDefault().getLog().log(status);
+ getDefault().getLog().log( status );
}

- public static void log(Throwable e, String message)
+ public static void log( Throwable e, String message )
{
boolean isDebugging = true; // change to false for production
- IStatus status =
- new Status(
- IStatus.ERROR,
- getDefault().getDescriptor().getUniqueIdentifier(),
- IStatus.ERROR,
- message,
- e);
+ IStatus status = new Status( IStatus.ERROR, getDefault()
+ .getDescriptor().getUniqueIdentifier(), IStatus.ERROR,
message,
+ e );

- log(status);
- if (isDebugging)
+ log( status );
+ if ( isDebugging )
{
- System.out.println(message + ": " + e.getMessage());
//$NON-NLS-1$
+ System.out.println( message + ": " + e.getMessage() );
//$NON-NLS-1$
}
}
}

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/.classpath
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/.classpath
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/.classpath
Mon Apr 11 01:48:23 2005
@@ -1,8 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="lib" path="lib/merlin-cli-3.2.4.jar"/>
- <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="lib" path="lib/merlin-cli-3.2.4.jar">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/build.properties
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/build.properties
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/build.properties
Mon Apr 11 01:48:23 2005
@@ -3,7 +3,9 @@
MerlinDeveloperLaunch.jar,\
icons/,\
lib/
-source.MerlinDeveloperLaunch.jar = src/
+source.MerlinDeveloperLaunch.jar = src/,\
+ bin/
src.includes = src/,\
plugin.xml,\
build.xml
+output.MerlinDeveloperLaunch.jar = bin/

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/MerlinDeveloperLaunch.java
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/MerlinDeveloperLaunch.java
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/MerlinDeveloperLaunch.java
Mon Apr 11 01:48:23 2005
@@ -1,19 +1,19 @@
/*
-
- Copyright 2004. The Apache Software Foundation.
+
+ Copyright 2004. The Apache Software Foundation.

- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
*/

package org.apache.avalon.ide.eclipse.merlin.launch;
@@ -29,6 +29,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
import org.eclipse.ui.plugin.AbstractUIPlugin;

@@ -38,120 +39,126 @@
*/
public class MerlinDeveloperLaunch extends AbstractUIPlugin
{
- //The shared instance.
+ // The shared instance.
private static MerlinDeveloperLaunch plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;

- public static final String PLUGIN_ID =
"org.apache.avalon.MerlinDeveloperLaunch";
- public static final String MERLIN_PROJECT_NATURE_ID =
- PLUGIN_ID + ".merlinProjectNature";
- public static final String MERLIN_PROJECT_CONFIG_NATURE_ID =
- PLUGIN_ID + ".merlinConfigNature";
- public static final String MERLIN_BUILDER_ID =
- PLUGIN_ID + ".merlinBuilder";
- public static final String ID_MERLIN_CONTAINER =
- MerlinDeveloperLaunch.PLUGIN_ID +
".merlinLaunchConfigurationDelegate"; //$NON-NLS-1$
- public static final String ATTR_MERLIN_CONTAINER_ID =
"merlinContainerID"; //$NON-NLS-1$
+ // Resource bundle.
+ private ResourceBundle resourceBundle;
+
+ public static final String PLUGIN_ID =
"org.apache.avalon.MerlinDeveloperLaunch";
+
+ public static final String MERLIN_PROJECT_NATURE_ID =
PLUGIN_ID
+
+ ".merlinProjectNature";
+
+ public static final String MERLIN_PROJECT_CONFIG_NATURE_ID =
PLUGIN_ID
+
+ ".merlinConfigNature";
+
+ public static final String MERLIN_BUILDER_ID =
PLUGIN_ID
+
+ ".merlinBuilder";
+
+ public static final String ID_MERLIN_CONTAINER =
MerlinDeveloperLaunch.PLUGIN_ID
+
+ ".merlinLaunchConfigurationDelegate"; //$NON-NLS-1$
+
+ public static final String ATTR_MERLIN_CONTAINER_ID =
"merlinContainerID"; //$NON-NLS-1$
+
/**
- * The constructor.
- */
- public MerlinDeveloperLaunch(IPluginDescriptor descriptor)
- {
- super(descriptor);
- plugin = this;
- try
- {
- // activate EnterpriseDeveloper if present
- Platform.getPlugin("biz.softwarefabrik.j4ee.core");
-
- resourceBundle =
- ResourceBundle.getBundle(
-
"org.apache.avalon.ide.eclipse.merlin.launch.MerlinDeveloperLaunchResources");
- } catch (MissingResourceException x)
- {
- resourceBundle = null;
+ * The constructor.
+ */
+ public MerlinDeveloperLaunch( IPluginDescriptor iDescriptor )
+ {
+ super( iDescriptor );
+ plugin = this;
+ try
+ {
+ // activate EnterpriseDeveloper if present
+ Platform.getPlugin( "biz.softwarefabrik.j4ee.core" );
+
+ resourceBundle = ResourceBundle
+ .getBundle(
"org.apache.avalon.ide.eclipse.merlin.launch.MerlinDeveloperLaunchResources"
);
+ }
+ catch ( MissingResourceException x )
+ {
+ resourceBundle = null;
+ }
}
- }

/**
- * Returns the shared instance.
- */
+ * Returns the shared instance.
+ */
public static MerlinDeveloperLaunch getDefault()
{
return plugin;
}

/**
- * Returns the workspace instance.
- */
+ * Returns the workspace instance.
+ */
public static IWorkspace getWorkspace()
{
return ResourcesPlugin.getWorkspace();
}

/**
- * Returns the string from the plugin's resource bundle, or 'key' if
not
- * found.
- */
- public static String getResourceString(String key)
+ * Returns the string from the plugin's resource bundle, or 'key' if not
+ * found.
+ */
+ public static String getResourceString( String key )
{
- ResourceBundle bundle =
MerlinDeveloperLaunch.getDefault().getResourceBundle();
+ ResourceBundle bundle = MerlinDeveloperLaunch.getDefault()
+ .getResourceBundle();
try
{
- return (bundle != null ? bundle.getString(key) : key);
- } catch (MissingResourceException e)
+ return ( bundle != null ? bundle.getString( key ) : key );
+ }
+ catch ( MissingResourceException e )
{
return key;
}
}

/**
- * Returns the plugin's resource bundle,
- */
+ * Returns the plugin's resource bundle,
+ */
public ResourceBundle getResourceBundle()
{
return resourceBundle;
}

- public static void log(IStatus status)
+ public static void log( IStatus status )
{
- getDefault().getLog().log(status);
+ getDefault().getLog().log( status );
}

- public static void log(Throwable e, String message)
+ public static void log( Throwable e, String message )
{
boolean isDebugging = true; // change to false for production
- IStatus status =
- new Status(
- IStatus.ERROR,
- getDefault().getDescriptor().getUniqueIdentifier(),
- IStatus.ERROR,
- message,
- e);
+ IStatus status = new Status( IStatus.ERROR, getDefault()
+ .getDescriptor().getUniqueIdentifier(), IStatus.ERROR,
message,
+ e );

- log(status);
- if (isDebugging)
+ log( status );
+ if ( isDebugging )
{
- System.out.println(message + ": " + e.getMessage());
//$NON-NLS-1$
+ System.out.println( message + ": " + e.getMessage() );
//$NON-NLS-1$
}
}

public IPath getPluginLocation()
{
- return getPluginLocation(MerlinDeveloperLaunch.PLUGIN_ID);
+ return getPluginLocation( MerlinDeveloperLaunch.PLUGIN_ID );
}

- public IPath getPluginLocation(String pluginId)
+ public IPath getPluginLocation( String pluginId )
{
try
{
- URL installURL =
-
Platform.getPluginRegistry().getPluginDescriptor(pluginId).getInstallURL();
- return new Path(Platform.resolve(installURL).getFile());
- } catch (Exception e)
+ URL installURL =
Platform.getPluginRegistry().getPluginDescriptor(
+ pluginId ).getInstallURL();
+ return new Path( Platform.resolve( installURL ).getFile() );
+ }
+ catch ( Exception e )
{
- log(e, "getPluginLocation() handling Exception"); //$NON-NLS-1$
+ log( e, "getPluginLocation() handling Exception" ); //$NON-NLS-1$
return null;
}
}

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/.classpath
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/.classpath
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/.classpath
Mon Apr 11 01:48:23 2005
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.eclipse.pde.core.requiredPlugins">
+ <attributes>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER">
+ <attributes>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/build.properties
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/build.properties
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/build.properties
Mon Apr 11 01:48:23 2005
@@ -3,10 +3,14 @@
MerlinDeveloperUI.jar,\
plugin.properties,\
properties/,\
- icons/
-source.MerlinDeveloperUI.jar = src/
+ icons/,\
+ bin/
+source.MerlinDeveloperUI.jar = src/,\
+ bin/
src.includes = src/,\
properties/,\
icons/,\
plugin.properties,\
- build.xml
+ build.xml,\
+ bin/
+output.MerlinDeveloperUI.jar = bin/

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/MerlinDeveloperUI.java
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/MerlinDeveloperUI.java
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/MerlinDeveloperUI.java
Mon Apr 11 01:48:23 2005
@@ -1,19 +1,19 @@
/*
-
- Copyright 2004. The Apache Software Foundation.
+
+ Copyright 2004. The Apache Software Foundation.

- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
*/
package org.apache.avalon.ide.eclipse.merlin.ui;

@@ -29,108 +29,120 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;

/**
- * @author <a href="mailto:dev AT avalon.apache.org";>Avalon Development
Team</a>
- * The main plugin class to be used in the desktop.
+ * @author <a href="mailto:dev AT avalon.apache.org";>Avalon Development Team</a>
+ * The main plugin class to be used in the desktop.
*/
public class MerlinDeveloperUI extends AbstractUIPlugin
{
- //The shared instance.
+ // The shared instance.
private static MerlinDeveloperUI plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
- public static final String PLUGIN_ID =
"org.apache.avalon.MerlinDeveloperUI";
- /**
- * The constructor.
- */
- public MerlinDeveloperUI(IPluginDescriptor descriptor)
- {
- super(descriptor);
- plugin = this;
- try
- {
- resourceBundle =
- ResourceBundle.getBundle(
-
"org.apache.avalon.ide.eclipse.merlin.ui.MerlinDeveloperUIResources");
- } catch (MissingResourceException x)
- {
- resourceBundle = null;
+
+ // Resource bundle.
+ private ResourceBundle resourceBundle;
+
+ public static final String PLUGIN_ID =
"org.apache.avalon.MerlinDeveloperUI";
+
+ /**
+ * The constructor.
+ */
+ public MerlinDeveloperUI( IPluginDescriptor iDescriptor )
+ {
+ super( iDescriptor );
+ plugin = this;
+ try
+ {
+ resourceBundle = ResourceBundle
+ .getBundle(
"org.apache.avalon.ide.eclipse.merlin.ui.MerlinDeveloperUIResources" );
+ }
+ catch ( MissingResourceException x )
+ {
+ resourceBundle = null;
+ }
}
+
+ /**
+ * This method is called upon plug-in activation
+ */
+ public void start( BundleContext context ) throws Exception
+ {
+ super.start( context );
}

/**
- * Returns the shared instance.
- */
+ * Returns the shared instance.
+ */
public static MerlinDeveloperUI getDefault()
{
return plugin;
}

/**
- * Returns the workspace instance.
- */
+ * Returns the workspace instance.
+ */
public static IWorkspace getWorkspace()
{
return ResourcesPlugin.getWorkspace();
}

/**
- * Returns the string from the plugin's resource bundle, or 'key' if
not
- * found.
- */
- public static String getResourceString(String key)
+ * Returns the string from the plugin's resource bundle, or 'key' if not
+ * found.
+ */
+ public static String getResourceString( String key )
{
- ResourceBundle bundle =
MerlinDeveloperUI.getDefault().getResourceBundle();
+ ResourceBundle bundle = MerlinDeveloperUI.getDefault()
+ .getResourceBundle();
try
{
- return (bundle != null ? bundle.getString(key) : key);
- } catch (MissingResourceException e)
+ return ( bundle != null ? bundle.getString( key ) : key );
+ }
+ catch ( MissingResourceException e )
{
return key;
}
}

/**
- * Returns the plugin's resource bundle,
- */
+ * Returns the plugin's resource bundle,
+ */
public ResourceBundle getResourceBundle()
{
return resourceBundle;
}

- public static void log(IStatus status)
+ public static void log( IStatus status )
{
- getDefault().getLog().log(status);
+ getDefault().getLog().log( status );
}

- public static void log(Throwable e, String message)
+ public static void log( Throwable e, String message )
{
boolean isDebugging = true; // change to false for production
- IStatus status =
- new Status(
- IStatus.ERROR,
- getDefault().getDescriptor().getUniqueIdentifier(),
- IStatus.ERROR,
- message,
- e);
+ IStatus status = new Status( IStatus.ERROR, getDefault()
+ .getDescriptor().getUniqueIdentifier(), IStatus.ERROR,
message,
+ e );

- log(status);
- if (isDebugging)
+ log( status );
+ if ( isDebugging )
{
- System.out.println(message + ": " + e.getMessage());
//$NON-NLS-1$
+ System.out.println( message + ": " + e.getMessage() );
//$NON-NLS-1$
}
}

- public static ImageDescriptor getImageDescriptor(String path)
+ public static ImageDescriptor getImageDescriptor( String path )
{
try
{
- URL prefix =
MerlinDeveloperUI.getDefault().getDescriptor().getInstallURL();
- return ImageDescriptor.createFromURL(new URL(prefix, path));
- } catch (MalformedURLException e)
+ URL prefix = MerlinDeveloperUI.getDefault().getDescriptor()
+ .getInstallURL();
+ return ImageDescriptor.createFromURL( new URL( prefix, path ) );
+ }
+ catch ( MalformedURLException e )
{
- log(e, "getResourceBundle() handling MalformedURLException");
//$NON-NLS-1$
+ log( e, "getResourceBundle() handling MalformedURLException" );
//$NON-NLS-1$
return null;
}
}

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools/JavadocProcessor.java
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools/JavadocProcessor.java
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools/JavadocProcessor.java
Mon Apr 11 01:48:23 2005
@@ -1,19 +1,19 @@
/*
-
- Copyright 2004. The Apache Software Foundation.
+
+ Copyright 2004. The Apache Software Foundation.

- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
*/
package org.apache.avalon.ide.eclipse.merlin.ui.tools;

@@ -30,50 +30,63 @@

/**
* @author Andreas Develop
- *
+ *
*/
public class JavadocProcessor implements IJavadocCompletionProcessor
{

- /* (non-Javadoc)
- * @see
org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeContextInformation(org.eclipse.jdt.core.ICompilationUnit,
int)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeContextInformation(org.eclipse.jdt.core.ICompilationUnit,
+ * int)
*/
- public IContextInformation[] computeContextInformation(ICompilationUnit
cUnit, int offset)
+ public IContextInformation[] computeContextInformation(
+ ICompilationUnit cUnit, int offset )
{
//
return null;
}

- /* (non-Javadoc)
- * @see
org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeCompletionProposals(org.eclipse.jdt.core.ICompilationUnit,
int, int, int)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeCompletionProposals(org.eclipse.jdt.core.ICompilationUnit,
+ * int, int, int)
*/
public IJavaCompletionProposal[] computeCompletionProposals(
- ICompilationUnit cUnit,
- int offset,
- int length,
- int flags)
+ ICompilationUnit cUnit, int offset, int length, int flags )
{
// TODO Auto-generated method stub
List props = new ArrayList();

- ResourceBundle bundle =
MerlinDeveloperUI.getDefault().getResourceBundle();
- Enumeration enum = bundle.getKeys();
- while (enum.hasMoreElements())
+ ResourceBundle bundle = MerlinDeveloperUI.getDefault()
+ .getResourceBundle();
+ Enumeration enumeration = bundle.getKeys();
+ while ( enumeration.hasMoreElements() )
{
- String key = (String) enum.nextElement();
- if (key.startsWith("javadoc.avalon") && (! key.endsWith(".tag")))
+ String key = (String) enumeration.nextElement();
+ if ( key.startsWith( "javadoc.avalon" )
+ && ( !key.endsWith( ".tag" ) ) )
{
- AvalonProposals prop = new AvalonProposals(offset, length);
- prop.setKey("@" + key.substring(8,key.length()));
-
prop.setDescription(MerlinDeveloperUI.getResourceString(key));
- prop.setTag(MerlinDeveloperUI.getResourceString(key +
".tag"));
- props.add(prop);
+ AvalonProposals prop = new AvalonProposals( offset, length );
+ prop.setKey( "@" + key.substring( 8, key.length() ) );
+ prop
+ .setDescription( MerlinDeveloperUI
+ .getResourceString( key ) );
+ prop
+ .setTag( MerlinDeveloperUI.getResourceString( key
+ + ".tag" ) );
+ props.add( prop );
}
}
- return (IJavaCompletionProposal[]) props.toArray(new
AvalonProposals[props.size()]);
+ return (IJavaCompletionProposal[]) props
+ .toArray( new AvalonProposals[props.size()] );
}

- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see
org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#getErrorMessage()
*/
public String getErrorMessage()
@@ -81,13 +94,14 @@
// TODO Auto-generated method stub
return null;
}
+
/**
*
*/
public JavadocProcessor()
- {
- super();
- // TODO Auto-generated constructor stub
- }
+ {
+ super();
+ // TODO Auto-generated constructor stub
+ }

}

Modified:
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinProjectSelectionPage.java
==============================================================================
---
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinProjectSelectionPage.java
(original)
+++
development/laboratory/ide/eclipse/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinProjectSelectionPage.java
Mon Apr 11 01:48:23 2005
@@ -171,7 +171,7 @@
// Get the Metainfo for the NewProjectWizards
ProjectModelConfiguration projectConfig =
ProjectResourceManager.getProjectModelConfiguration(
- "/properties/newProjectWizard.xcfg",
+ "/properties/NewProjectWizard.xcfg",
MerlinDeveloperUI.PLUGIN_ID);

// show all avalilable ProjectTypes

svn commit: r2263 - in development/laboratory/ide/eclipse: org.apache.avalon.ide.eclipse.core org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/merlin/core org.apache.avalon.ide.eclipse.launch org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch org.apache.avalon.ide.eclipse.ui org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards, peter, 04/10/2005