Opps. Should not of moved BeanInfoNature to core pkg. Forgot that this will break people outside of VE. For now we don't want to gratuitously create such breakage until we are ready to declare API. At that time things will move around.
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java index f2cd486..5b12900 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: BeaninfoModelSynchronizer.java,v $ - * $Revision: 1.3 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.4 $ $Date: 2004/03/24 15:07:44 $ */ import java.util.*; @@ -24,7 +24,6 @@ import org.eclipse.jdt.core.*; import org.eclipse.jem.internal.adapters.jdom.JavaModelListener; -import org.eclipse.jem.internal.beaninfo.core.*; /** * This class listens for changes to the java model and flushs the * appropriate class introspection.
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoNature.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java similarity index 99% rename from plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoNature.java rename to plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java index a748c6b..f635fc1 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoNature.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
@@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.beaninfo.core; +package org.eclipse.jem.internal.beaninfo.adapters; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: BeaninfoNature.java,v $ - * $Revision: 1.1 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.11 $ $Date: 2004/03/24 15:07:44 $ */ import java.io.*; @@ -34,7 +34,7 @@ import org.w3c.dom.Element; import org.xml.sax.InputSource; -import org.eclipse.jem.internal.beaninfo.adapters.*; +import org.eclipse.jem.internal.beaninfo.core.*; import org.eclipse.jem.internal.java.adapters.JavaXMIFactoryImpl; import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter; import org.eclipse.jem.internal.java.init.JavaInit;
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/DOMReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java similarity index 94% rename from plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/DOMReader.java rename to plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java index 1a065a7..48ea81f 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/DOMReader.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java
@@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.beaninfo.core; +package org.eclipse.jem.internal.beaninfo.adapters; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: DOMReader.java,v $ - * $Revision: 1.1 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.4 $ $Date: 2004/03/24 15:07:44 $ */ import org.w3c.dom.Element; @@ -19,6 +19,7 @@ import org.w3c.dom.NodeList; + /** * The internal class for reading dom elements. * @version 1.0
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java similarity index 86% rename from plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IReader.java rename to plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java index fa7d83c..78af9db 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IReader.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java
@@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.beaninfo.core; +package org.eclipse.jem.internal.beaninfo.adapters; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,16 +11,16 @@ *******************************************************************************/ /* * $RCSfile: IReader.java,v $ - * $Revision: 1.1 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.3 $ $Date: 2004/03/24 15:07:44 $ */ /** * This is internal interface for reading beaninfoConfig either through IConfigurationElements or * w3.dom.Nodes. This is because when reading the .beaninfoConfig we will be using Nodes, but * when reading configs from registered extensions they will be IConfigurationElements. * @version 1.0 - * @author + * TODO Need to move to core when we make things API. */ -interface IReader { +public interface IReader { public Object getChildren(Object node); public int getLength(Object nodeList);
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SpecialResourceSet.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java similarity index 93% rename from plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SpecialResourceSet.java rename to plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java index d015ae8..7703742 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SpecialResourceSet.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
@@ -1,4 +1,4 @@ -package org.eclipse.jem.internal.beaninfo.core; +package org.eclipse.jem.internal.beaninfo.adapters; /******************************************************************************* * Copyright (c) 2001, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: SpecialResourceSet.java,v $ - * $Revision: 1.1 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.5 $ $Date: 2004/03/24 15:07:44 $ */ import com.ibm.wtp.internal.emf.workbench.ProjectResourceSetImpl;
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java index 00a0eaf..2134d1f 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: BeaninfoEntry.java,v $ - * $Revision: 1.1 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.2 $ $Date: 2004/03/24 15:07:44 $ */ import java.util.ArrayList; @@ -25,6 +25,8 @@ import org.eclipse.jdt.core.*; import org.w3c.dom.*; +import org.eclipse.jem.internal.beaninfo.adapters.*; + /** * Beaninfo entry. Location of the beaninfos. Much like a standard classpath entry. * The BeanInfos are either in a jar or another project. They can be supplied as
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java index 7e74be5..dcbfc85 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: BeaninfoPlugin.java,v $ - * $Revision: 1.1 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.2 $ $Date: 2004/03/24 15:07:44 $ */ @@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jdt.core.IClasspathContainer; +import org.eclipse.jem.internal.beaninfo.adapters.*; import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo; import org.eclipse.jem.internal.proxy.core.ProxyPlugin; import org.eclipse.jem.internal.proxy.core.ProxyPlugin.ContributorExtensionPointInfo;
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java index 9042f1f..2a47bc1 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java
@@ -11,13 +11,15 @@ *******************************************************************************/ /* * $RCSfile: BeaninfosDoc.java,v $ - * $Revision: 1.1 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.2 $ $Date: 2004/03/24 15:07:44 $ */ import java.util.ArrayList; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.w3c.dom.*; + +import org.eclipse.jem.internal.beaninfo.adapters.*; /** * Beaninfos document in-memory format. */
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java index 223e6f9..decf591 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java
@@ -11,13 +11,15 @@ *******************************************************************************/ /* * $RCSfile: ConfigurationElementReader.java,v $ - * $Revision: 1.1 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.2 $ $Date: 2004/03/24 15:07:44 $ */ import java.lang.reflect.Array; import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.jem.internal.beaninfo.adapters.*; + /** * For reading from IConfigurationElements
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java index 7e4933b..10ce787 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: SearchpathEntry.java,v $ - * $Revision: 1.1 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.2 $ $Date: 2004/03/24 15:07:44 $ */ import org.eclipse.core.resources.IProject; @@ -20,6 +20,8 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.w3c.dom.*; +import org.eclipse.jem.internal.beaninfo.adapters.*; + /** * Searchpath entry. Beaninfo searchpath entry (i.e. package name). Can include * kind/path/exported if not a child of the BeaninfoEntry.
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java index a81ae2e..8e61323 100644 --- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java +++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: Utilities.java,v $ - * $Revision: 1.1 $ $Date: 2004/03/22 23:49:10 $ + * $Revision: 1.2 $ $Date: 2004/03/24 15:07:44 $ */ import java.lang.reflect.InvocationTargetException; import java.util.Iterator; @@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jem.internal.beaninfo.*; +import org.eclipse.jem.internal.beaninfo.adapters.*; import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoProxyConstants; import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor; import org.eclipse.jem.internal.proxy.core.*;
diff --git a/plugins/org.eclipse.jem.beaninfo/plugin.xml b/plugins/org.eclipse.jem.beaninfo/plugin.xml index 1f83ecc..6c0d575 100644 --- a/plugins/org.eclipse.jem.beaninfo/plugin.xml +++ b/plugins/org.eclipse.jem.beaninfo/plugin.xml
@@ -37,7 +37,7 @@ point="org.eclipse.core.resources.natures"> <runtime> <run - class="org.eclipse.jem.internal.beaninfo.core.BeaninfoNature"> + class="org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature"> </run> </runtime> </extension>
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java index 9f0e70b..8eb45d3 100644 --- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java +++ b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java
@@ -11,7 +11,7 @@ *******************************************************************************/ /* * $RCSfile: BeaninfoPathsBlock.java,v $ - * $Revision: 1.3 $ $Date: 2004/03/22 23:48:57 $ + * $Revision: 1.4 $ $Date: 2004/03/24 15:07:52 $ */ import java.io.File; @@ -42,6 +42,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.*; +import org.eclipse.jem.internal.beaninfo.adapters.*; import org.eclipse.jem.internal.beaninfo.core.*; import org.eclipse.jem.internal.ui.core.JEMUIPlugin;