You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/05/24 21:14:41 UTC
svn commit: r778237 - in
/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin:
./ src/main/java/org/ src/main/java/org/apache/
src/main/java/org/apache/kato/ src/main/java/org/apache/kato/api/
src/main/java/or...
Author: spoole
Date: Sun May 24 21:14:39 2009
New Revision: 778237
URL: http://svn.apache.org/viewvc?rev=778237&view=rev
Log:
simple changes to get the maven build to build using eclipe 3.4
Added:
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/Activator.java
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferenceConstants.java
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferenceInitializer.java
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferencePage.java
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/RegisteredFactoriesFieldEditor.java
Modified:
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.project
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/plugin.xml
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath?rev=778237&r1=778236&r2=778237&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.classpath Sun May 24 21:14:39 2009
@@ -4,9 +4,8 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry exported="true" kind="lib" path="target/lib/kato.api.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.project
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.project?rev=778237&r1=778236&r2=778237&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.project (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/.project Sun May 24 21:14:39 2009
@@ -11,17 +11,17 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
+ <name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
+ <name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/plugin.xml
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/plugin.xml?rev=778237&r1=778236&r2=778237&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/plugin.xml (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/plugin.xml Sun May 24 21:14:39 2009
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
- <!--
<extension-point id="org.apache.kato.factory" name="ImageFactory" schema="schema/org.apache.kato.factory.exsd"/>
- -->
-
+
<extension
point="org.eclipse.ui.preferencePages">
<page
Added: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/Activator.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/Activator.java?rev=778237&view=auto
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/Activator.java (added)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/Activator.java Sun May 24 21:14:39 2009
@@ -0,0 +1,84 @@
+package org.apache.kato.api.plugin;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.kato.FactoryRegistry;
+import org.apache.kato.image.Image;
+import org.apache.kato.image.ImageFactory;
+import org.eclipse.core.runtime.content.IContentTypeManager;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.apache.kato.api.plugin";
+
+ // The shared instance
+ private static Activator plugin;
+ private FactoryRegistry registry=null;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+
+ IContentTypeManager t;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ registry=FactoryRegistry.getDefaultRegistry();
+ /**
+ registry.addFactory(new org.apache.kato.jvmti.process.ImageFactoryImpl());
+ registry.addFactory(new org.apache.kato.hprof.image.ImageFactoryImpl());
+ registry.addFactory(new com.ibm.katoblue.image.j9.ImageFactoryImpl());
+ registry.addFactory(new com.ibm.katoblue.image.javacore.JCImageFactory());
+ **/
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ public Image getImage(File file) throws IOException {
+ return registry.getImage(file);
+ }
+ public ImageFactory[] getRegisteredFactories() {
+ return registry.getFactories();
+ }
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+ /**
+ * Returns an image descriptor for the image file at the given
+ * plug-in relative path
+ *
+ * @param path the path
+ * @return the image descriptor
+ */
+ public static ImageDescriptor getImageDescriptor(String path) {
+ return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ }
+}
Added: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferenceConstants.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferenceConstants.java?rev=778237&view=auto
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferenceConstants.java (added)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferenceConstants.java Sun May 24 21:14:39 2009
@@ -0,0 +1,16 @@
+package org.apache.kato.api.plugin.preferences;
+
+/**
+ * Constant definitions for plug-in preferences
+ */
+public class PreferenceConstants {
+
+ public static final String P_PATH = "pathPreference";
+
+ public static final String P_BOOLEAN = "booleanPreference";
+
+ public static final String P_CHOICE = "choicePreference";
+
+ public static final String P_STRING = "stringPreference";
+
+}
Added: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferenceInitializer.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferenceInitializer.java?rev=778237&view=auto
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferenceInitializer.java (added)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferenceInitializer.java Sun May 24 21:14:39 2009
@@ -0,0 +1,26 @@
+package org.apache.kato.api.plugin.preferences;
+
+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
+import org.eclipse.jface.preference.IPreferenceStore;
+
+import org.apache.kato.api.plugin.Activator;
+
+/**
+ * Class used to initialize default preference values.
+ */
+public class PreferenceInitializer extends AbstractPreferenceInitializer {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
+ */
+ public void initializeDefaultPreferences() {
+ IPreferenceStore store = Activator.getDefault().getPreferenceStore();
+ store.setDefault(PreferenceConstants.P_BOOLEAN, true);
+ store.setDefault(PreferenceConstants.P_CHOICE, "choice2");
+ store.setDefault(PreferenceConstants.P_STRING,
+ "Default value");
+ }
+
+}
Added: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferencePage.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferencePage.java?rev=778237&view=auto
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferencePage.java (added)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/PreferencePage.java Sun May 24 21:14:39 2009
@@ -0,0 +1,31 @@
+package org.apache.kato.api.plugin.preferences;
+
+import org.eclipse.jface.preference.*;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.IWorkbench;
+import org.apache.kato.api.plugin.Activator;
+
+
+public class PreferencePage
+ extends FieldEditorPreferencePage
+ implements IWorkbenchPreferencePage {
+
+ public PreferencePage() {
+ super(GRID);
+ setPreferenceStore(Activator.getDefault().getPreferenceStore());
+ setDescription("Apache Kato preferences");
+ }
+
+
+ public void createFieldEditors() {
+ addField(new RegisteredFactoriesFieldEditor("Registered Factories","my label",getFieldEditorParent()));
+ addField(new IntegerFieldEditor("Factories","Factories",getFieldEditorParent()));
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
+ */
+ public void init(IWorkbench workbench) {
+ }
+
+}
\ No newline at end of file
Added: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/RegisteredFactoriesFieldEditor.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/RegisteredFactoriesFieldEditor.java?rev=778237&view=auto
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/RegisteredFactoriesFieldEditor.java (added)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/src/main/java/org/apache/kato/api/plugin/preferences/RegisteredFactoriesFieldEditor.java Sun May 24 21:14:39 2009
@@ -0,0 +1,72 @@
+package org.apache.kato.api.plugin.preferences;
+
+
+
+import org.apache.kato.api.plugin.Activator;
+import org.apache.kato.image.ImageFactory;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.List;
+
+public class RegisteredFactoriesFieldEditor extends FieldEditor {
+
+
+ private List list=null;
+
+ public RegisteredFactoriesFieldEditor(String name, String labelText,
+ Composite parent) {
+
+ init(name, labelText);
+ createControl(parent);
+
+
+
+ }
+
+ @Override
+ protected void adjustForNumColumns(int numColumns) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ protected void doFillIntoGrid(Composite parent, int numColumns) {
+ list=new List(parent,SWT.NONE);
+ GridData gd = new GridData();
+ gd.horizontalSpan = numColumns;
+ list.setLayoutData(gd);
+ }
+
+ @Override
+ protected void doLoad() {
+ ImageFactory[] factories=Activator.getDefault().getRegisteredFactories();
+ for(ImageFactory f:factories) {
+ list.add(f.getClass().getCanonicalName());
+ }
+ list.add("---");
+ }
+
+ @Override
+ protected void doLoadDefault() {
+ ImageFactory[] factories=Activator.getDefault().getRegisteredFactories();
+ for(ImageFactory f:factories) {
+ list.add(f.getClass().getCanonicalName());
+ }
+ list.add("---");
+ }
+
+ @Override
+ protected void doStore() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public int getNumberOfControls() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+}